diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index b50062403eb461ec5985f8bed7a868be5b8a8847..f8ca1eb6abe8c233847e25ed153038f922309813 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -722,6 +722,12 @@ class installer_dist extends installer_base { $tpl = new tpl('apache_ispconfig.conf.master'); $tpl->setVar('apache_version',getapacheversion()); + if($this->is_update == true) { + $tpl->setVar('logging',get_logging_state()); + } else { + $tpl->setVar('logging','yes'); + } + $records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']); $ip_addresses = array(); @@ -806,6 +812,17 @@ class installer_dist extends installer_base { //* add a sshusers group $command = 'groupadd sshusers'; if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + + // add anonymized log option to nginxx.conf file + $nginx_conf_file = $conf['nginx']['config_dir'].'/nginx.conf'; + if(is_file($nginx_conf_file)) { + $tmp = file_get_contents($nginx_conf_file); + if(!stristr($tmp, 'log_format anonymized')) { + copy($nginx_conf_file,$nginx_conf_file.'~'); + replaceLine($nginx_conf_file, 'http {', "http {\n\n".file_get_contents('tpl/nginx_anonlog.master'), 0, 0); + } + } + } public function configure_bastille_firewall() diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 0fd5460f0f2ee2499ec6a3da73cd6d2b276f332e..f0c28a61c27d24f17162e12811cff88d2dab6b62 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -603,6 +603,12 @@ class installer extends installer_base $tpl = new tpl('apache_ispconfig.conf.master'); $tpl->setVar('apache_version',getapacheversion()); + if($this->is_update == true) { + $tpl->setVar('logging',get_logging_state()); + } else { + $tpl->setVar('logging','yes'); + } + $records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']); $ip_addresses = array(); diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 7df8d1abaeb49156ffa1c211a84ce9ae83898939..1525b4a644d0e1b3a19d81ff525a7654e4b0b8f0 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -691,6 +691,12 @@ class installer_dist extends installer_base { $tpl = new tpl('apache_ispconfig.conf.master'); $tpl->setVar('apache_version',getapacheversion()); + if($this->is_update == true) { + $tpl->setVar('logging',get_logging_state()); + } else { + $tpl->setVar('logging','yes'); + } + $records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']); $ip_addresses = array(); @@ -817,6 +823,16 @@ class installer_dist extends installer_base { //* add a sshusers group $command = 'groupadd sshusers'; if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + + // add anonymized log option to nginxx.conf file + $nginx_conf_file = $conf['nginx']['config_dir'].'/nginx.conf'; + if(is_file($nginx_conf_file)) { + $tmp = file_get_contents($nginx_conf_file); + if(!stristr($tmp, 'log_format anonymized')) { + copy($nginx_conf_file,$nginx_conf_file.'~'); + replaceLine($nginx_conf_file, 'http {', "http {\n\n".file_get_contents('tpl/nginx_anonlog.master'), 0, 0); + } + } } public function configure_bastille_firewall() diff --git a/install/install.php b/install/install.php index dfbd40d757e183837ff06a3341ca933583014c68..524918454839238b73d4fe41a2ffdbc774dd8cd3 100644 --- a/install/install.php +++ b/install/install.php @@ -99,6 +99,9 @@ require_once 'lib/classes/tpl.inc.php'; die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.'); }*/ +// Patch is required to reapir latest amavis versions +if(is_installed('amavisd-new') && !is_installed('patch')) die('The patch command is missing. Install patch command and start installation again.'); + //** Get distribution identifier $dist = get_distname(); diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index b7fad60e75600b17afb7bedeb8c9897a82f42e49..b2d9e66f76deec5cc3697c77e7f1c20ac04b2769 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -97,6 +97,10 @@ function get_distname() { $mainver = current($mainver).'.'.next($mainver); } switch ($mainver){ + case "18.04": + $relname = "(Bionic Beaver)"; + $distconfid = 'ubuntu1804'; + break; case "17.10": $relname = "(Artful Aardvark)"; $distconfid = 'ubuntu1710'; @@ -874,6 +878,28 @@ function is_ispconfig_ssl_enabled() { } } +/* +* Is anonymization enabled in ispconfig.conf file +*/ + +function get_logging_state() { + global $conf; + $ispconfig_conf_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.conf'; + + if(is_file($ispconfig_conf_file)) { + $tmp = file_get_contents($ispconfig_conf_file); + if(stristr($tmp, '/usr/local/ispconfig/server/scripts/vlogger -p -s access.log')) { + return 'anon'; + } elseif(stristr($tmp, '/usr/local/ispconfig/server/scripts/vlogger -s access.log')) { + return 'yes'; + } else { + return 'no'; + } + } else { + return 'yes'; + } +} + /** Function to find the hash file for timezone detection (c) 2012 Marius Cramer, pixcept KG, m.cramer@pixcept.de diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 0c3300e95d2e1b9d8b8c75d027dd36db50cb25a3..1818f776be27c5d0334bf58a40e325133d846edc 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -226,8 +226,15 @@ class installer_base { public function configure_database() { global $conf; - //* ensure no modes with errors for ENGINE=MyISAM - $this->db->query("SET sql_mode = ''"); + //* check sql-mode + /*$check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode"); + + if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') { + echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n"; + echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n"; + echo"to the mysqld-section in your mysql-config on this server and restart mysqld afterwards\n"; + die(); + }*/ $unwanted_sql_plugins = array('validate_password'); $sql_plugins = $this->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins); @@ -250,10 +257,10 @@ class installer_base { $this->error('Stopped: Database already contains some tables.'); } else { if($conf['mysql']['admin_password'] == '') { - caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", + caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -P ".escapeshellarg($conf['mysql']['port'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } else { - caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", + caselog("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -P ".escapeshellarg($conf['mysql']['port'])." ".escapeshellarg($conf['mysql']['database'])." < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } $db_tables = $this->db->getTables(); @@ -1981,6 +1988,14 @@ class installer_base { $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; $tpl = new tpl('apache_ispconfig.conf.master'); + $tpl->setVar('apache_version',getapacheversion()); + + if($this->is_update == true) { + $tpl->setVar('logging',get_logging_state()); + } else { + $tpl->setVar('logging','yes'); + } + $tpl->setVar('apache_version',getapacheversion(true)); $records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']); @@ -2066,6 +2081,17 @@ class installer_base { //* add a sshusers group $command = 'groupadd sshusers'; if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + + // add anonymized log option to nginxx.conf file + $nginx_conf_file = $conf['nginx']['config_dir'].'/nginx.conf'; + if(is_file($nginx_conf_file)) { + $tmp = file_get_contents($nginx_conf_file); + if(!stristr($tmp, 'log_format anonymized')) { + copy($nginx_conf_file,$nginx_conf_file.'~'); + replaceLine($nginx_conf_file, 'http {', "http {\n\n".file_get_contents('tpl/nginx_anonlog.master'), 0, 0); + } + } + } public function configure_fail2ban() { @@ -2239,6 +2265,11 @@ class installer_base { $tpl->setVar('apps_vhost_basedir',$conf['web']['website_basedir']); $tpl->setVar('apps_vhost_servername',$apps_vhost_servername); $tpl->setVar('apache_version',getapacheversion()); + if($this->is_update == true) { + $tpl->setVar('logging',get_logging_state()); + } else { + $tpl->setVar('logging','yes'); + } // comment out the listen directive if port is 80 or 443 @@ -2322,7 +2353,12 @@ class installer_base { $content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{cgi_socket}', $cgi_socket, $content); - if(file_exists('/var/run/php5-fpm.sock') || file_exists('/var/run/php/php7.0-fpm.sock')){ + if( file_exists('/var/run/php5-fpm.sock') + || file_exists('/var/run/php/php7.0-fpm.sock') + || file_exists('/var/run/php/php7.1-fpm.sock') + || file_exists('/var/run/php/php7.2-fpm.sock') + || file_exists('/var/run/php/php7.3-fpm.sock') + ){ $use_tcp = '#'; $use_socket = ''; } else { diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index 23a4e76cc3ea13711bece439cda1afb93428456e..f410722c4e3bf1873f946afe53ee2dda6d2918b3 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -82,9 +82,9 @@ function prepareDBDump() { if ($conf['powerdns']['installed']) { //** export the current PowerDNS database data if( !empty($conf["mysql"]["admin_password"]) ) { - system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']); + system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -P ".escapeshellarg($conf['mysql']['port'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']); } else { - system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']); + system("mysqldump -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -P ".escapeshellarg($conf['mysql']['port'])." -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']); } // create a backup copy of the PowerDNS database in the root folder @@ -103,7 +103,7 @@ function checkDbHealth() { $notok = array(); echo "Checking ISPConfig database .. "; - exec("mysqlcheck -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -r ".escapeshellarg($conf["mysql"]["database"]), $result); + exec("mysqlcheck -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -P ".escapeshellarg($conf['mysql']['port'])." -r ".escapeshellarg($conf["mysql"]["database"]), $result); for( $i=0; $idb->query("SET sql_mode = ''"); + //* check sql-mode + /* + $check_sql_mode = $inst->db->queryOneRecord("SELECT @@sql_mode"); + if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') { + echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n"; + echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n"; + echo"to the mysqld-section in your mysql-config on this server and restart mysqld afterwards\n"; + die(); + }*/ $unwanted_sql_plugins = array('validate_password'); $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins); @@ -203,9 +210,9 @@ function updateDbAndIni() { //* Load patch file into database if( !empty($conf["mysql"]["admin_password"]) ) { - $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename; + $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." -P ".escapeshellarg($conf['mysql']['port'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename; } else { - $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename; + $cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -P ".escapeshellarg($conf['mysql']['port'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename; } if(in_array($next_db_version,explode(',',$silent_update_versions))) { diff --git a/install/sql/incremental/upd_0086.sql b/install/sql/incremental/upd_0086.sql new file mode 100644 index 0000000000000000000000000000000000000000..563b2153cf669c3630797c842ef1978da96e0f25 --- /dev/null +++ b/install/sql/incremental/upd_0086.sql @@ -0,0 +1,5 @@ +ALTER TABLE `web_domain` ADD COLUMN `ssl_letsencrypt_exclude` enum('n','y') NOT NULL DEFAULT 'n' AFTER `ssl_letsencrypt`; +ALTER TABLE `remote_user` ADD `remote_access` ENUM('y','n') NOT NULL DEFAULT 'y' AFTER `remote_password`; +ALTER TABLE `remote_user` ADD `remote_ips` TEXT AFTER `remote_access`; +ALTER TABLE `server_php` ADD `active` enum('y','n') NOT NULL DEFAULT 'y' AFTER `php_fpm_pool_dir`; +ALTER TABLE `web_domain` CHANGE `log_retention` `log_retention` INT(11) NOT NULL DEFAULT '10'; \ No newline at end of file diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 19325bbd6233a6bdb81dd0ad6b71a339594370a9..5789829a2da17bbe73df58a3c1ea577309e9df0c 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1,4 +1,3 @@ -<<<<<<< HEAD ALTER TABLE `mail_mailinglist` ADD `list_type` enum('open','closed') NOT NULL DEFAULT 'open'; ALTER TABLE `mail_mailinglist` ADD `subject_prefix` varchar(50) NOT NULL DEFAULT ''; ALTER TABLE `mail_mailinglist` ADD `admins` mediumtext; @@ -94,8 +93,6 @@ ALTER TABLE `remote_user` ADD `remote_ips` TEXT AFTER `remote_access`; ALTER TABLE `web_domain` ADD `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n' AFTER `php_fpm_use_socket`; - - ALTER TABLE `client_template` ADD COLUMN `limit_xmpp_webpresence` ENUM( 'n', 'y' ) NOT NULL default 'y', ADD COLUMN `limit_xmpp_http_upload` ENUM( 'n', 'y' ) NOT NULL default 'n'; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 547ca060329bb1a5aed2ba22e4189a412e2ca64f..a689cd9bf4102af6924f27ff19c8b498ce13f31d 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1430,6 +1430,7 @@ CREATE TABLE `server_php` ( `php_fpm_init_script` varchar(255) DEFAULT NULL, `php_fpm_ini_dir` varchar(255) DEFAULT NULL, `php_fpm_pool_dir` varchar(255) DEFAULT NULL, + `active` enum('n','y') NOT NULL DEFAULT 'y', PRIMARY KEY (`server_php_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -2076,7 +2077,7 @@ CREATE TABLE `web_domain` ( `http_port` int(11) unsigned NOT NULL DEFAULT '80', `https_port` int(11) unsigned NOT NULL DEFAULT '443', `folder_directive_snippets` text, - `log_retention` int(11) NOT NULL DEFAULT '30', + `log_retention` int(11) NOT NULL DEFAULT '10', PRIMARY KEY (`domain_id`), UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` ) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master index 4930e253f98fddd7ebf6b1d34cc6cad147c7b008..ee1b693097a200505f42c7a7da3313b134d016b9 100644 --- a/install/tpl/apache_apps.vhost.master +++ b/install/tpl/apache_apps.vhost.master @@ -34,6 +34,21 @@ + + DocumentRoot {tmpl_var name='apps_vhost_dir'} + AddType application/x-httpd-php .php + + Options FollowSymLinks + AllowOverride None + + Require all granted + + Order allow,deny + Allow from all + + + + DocumentRoot {tmpl_var name='apps_vhost_dir'} SuexecUserGroup ispapps ispapps diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master index 91bf98cb7f18dbf6d4a43c66cd13ab8929fd9e63..333450726ba8f407b76d1e214bae6e80f99c78fa 100644 --- a/install/tpl/apache_ispconfig.conf.master +++ b/install/tpl/apache_ispconfig.conf.master @@ -18,8 +18,12 @@ SSLStaplingCache shmcb:/var/run/ocsp(128000) LogFormat '%v %h %l %u %t "%r" %>s %S "%{Referer}i" "%{User-Agent}i"' combined_ispconfig LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig + +CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog + + +CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog -CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig AllowOverride None diff --git a/install/tpl/nginx_anonlog.master b/install/tpl/nginx_anonlog.master new file mode 100644 index 0000000000000000000000000000000000000000..77b1dbbcc6655c2744057775498267efebd05d11 --- /dev/null +++ b/install/tpl/nginx_anonlog.master @@ -0,0 +1,20 @@ +map $remote_addr $ip_anonym1 { +default 0.0.0; +"~(?P(\d+)\.(\d+)\.(\d+))\.\d+" $ip; +"~(?P[^:]+:[^:]+):" $ip; +} + +map $remote_addr $ip_anonym2 { +default .0; +"~(?P(\d+)\.(\d+)\.(\d+))\.\d+" .0; +"~(?P[^:]+:[^:]+):" ::; +} + +map $ip_anonym1$ip_anonym2 $ip_anonymized { +default 0.0.0.0; +"~(?P.*)" $ip; +} + +log_format anonymized '$ip_anonymized - $remote_user [$time_local] ' +'"$request" $status $body_bytes_sent ' +'"$http_referer" "$http_user_agent"'; diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 163e4c13fd555c8c26256a389973a824a982ecb2..c3aa99baa5889a078b3850b7bbc2f4b9e7d4539a 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -29,6 +29,7 @@ munin_user= munin_password= monitor_system_updates=y migration_mode=n +log_retention=10 [mail] module=postfix_mysql @@ -114,6 +115,7 @@ overquota_notify_freq=7 overquota_db_notify_admin=y overquota_db_notify_client=y overquota_notify_onok=n +logging=yes [dns] bind_user=root diff --git a/install/update.php b/install/update.php index 0a8c2c54e15687a2519bb3f71222406fd9b18778..3361c3c1918c6bb8803bc67d44473bcbe0488016 100644 --- a/install/update.php +++ b/install/update.php @@ -98,6 +98,9 @@ if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) { die('This software cannot be installed on a server wich runs ISPConfig 2.x.'); } +// Patch is required to reapir latest amavis versions +if(is_installed('amavisd-new') && !is_installed('patch')) die('The patch command is missing. Install patch command and start update again.'); + //** Get distribution identifier $dist = get_distname(); @@ -157,6 +160,8 @@ $conf["mysql"]["database"] = $conf_old["db_database"]; $conf['mysql']['charset'] = 'utf8'; $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"]; $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"]; +$conf['mysql']['port'] = $conf_old["db_port"]; +if($conf['mysql']['port'] == 0 || $conf['mysql']['port'] == '') $conf['mysql']['port'] = 3306; $conf['language'] = $conf_old['language']; $conf['theme'] = $conf_old['theme']; if($conf['language'] == '{language}') $conf['language'] = 'en'; diff --git a/interface/lib/classes/ini_parser.inc.php b/interface/lib/classes/ini_parser.inc.php index b8dffbafa5cd57b316c3d16241ae867abc798fa3..9b41a38f07e996f8c5ff953d90047e3a1ac5dbb7 100644 --- a/interface/lib/classes/ini_parser.inc.php +++ b/interface/lib/classes/ini_parser.inc.php @@ -34,6 +34,7 @@ class ini_parser{ //* Converts a ini string to array public function parse_ini_string($ini) { + $this->config = array(); $ini = str_replace("\r\n", "\n", $ini); $lines = explode("\n", $ini); foreach($lines as $line) { diff --git a/interface/lib/classes/remote.d/admin.inc.php b/interface/lib/classes/remote.d/admin.inc.php index 099216f20b6a66790b87abf1ab9a8e2e8d5e35a5..347f8520b7490a3cc9502c2be072c629e2b6a40d 100644 --- a/interface/lib/classes/remote.d/admin.inc.php +++ b/interface/lib/classes/remote.d/admin.inc.php @@ -48,7 +48,7 @@ class remoting_admin extends remoting { * @param array permissions * @author "ispcomm", improved by M. Cramer */ - public function update_record_permissions($tablename, $index_field, $index_value, $permissions) { + public function update_record_permissions($session_id, $tablename, $index_field, $index_value, $permissions) { global $app; if(!$this->checkPerm($session_id, 'admin_record_permissions')) { diff --git a/interface/lib/classes/remote.d/dns.inc.php b/interface/lib/classes/remote.d/dns.inc.php index 88175a2c76fe658820a4d5ef9eb8f40aaec08b09..49209b183636ed76bc876d0090144bc918d97cb5 100644 --- a/interface/lib/classes/remote.d/dns.inc.php +++ b/interface/lib/classes/remote.d/dns.inc.php @@ -303,34 +303,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_aaaa_add($session_id, $client_id, $params) + public function dns_aaaa_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_aaaa_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_aaaa.tform.php', $client_id, $params); } //* Update a record - public function dns_aaaa_update($session_id, $client_id, $primary_id, $params) + public function dns_aaaa_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_aaaa_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->updateQuery('../dns/form/dns_aaaa.tform.php', $client_id, $primary_id, $params); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } //* Delete a record - public function dns_aaaa_delete($session_id, $primary_id) + public function dns_aaaa_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_aaaa_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_aaaa.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -351,34 +354,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_a_add($session_id, $client_id, $params) + public function dns_a_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_a_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_a.tform.php', $client_id, $params); } //* Update a record - public function dns_a_update($session_id, $client_id, $primary_id, $params) + public function dns_a_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_a_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_a.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_a_delete($session_id, $primary_id) + public function dns_a_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_a_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_a.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -399,34 +405,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_alias_add($session_id, $client_id, $params) + public function dns_alias_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_alias_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_alias.tform.php', $client_id, $params); } //* Update a record - public function dns_alias_update($session_id, $client_id, $primary_id, $params) + public function dns_alias_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_alias_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_alias.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_alias_delete($session_id, $primary_id) + public function dns_alias_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_alias_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_alias.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -447,34 +456,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_cname_add($session_id, $client_id, $params) + public function dns_cname_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_cname_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_cname.tform.php', $client_id, $params); } //* Update a record - public function dns_cname_update($session_id, $client_id, $primary_id, $params) + public function dns_cname_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_cname_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_cname.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_cname_delete($session_id, $primary_id) + public function dns_cname_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_cname_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_cname.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -495,34 +507,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_hinfo_add($session_id, $client_id, $params) + public function dns_hinfo_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_hinfo_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_hinfo.tform.php', $client_id, $params); } //* Update a record - public function dns_hinfo_update($session_id, $client_id, $primary_id, $params) + public function dns_hinfo_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_hinfo_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_hinfo.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_hinfo_delete($session_id, $primary_id) + public function dns_hinfo_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_hinfo_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_hinfo.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -543,34 +558,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_mx_add($session_id, $client_id, $params) + public function dns_mx_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_mx_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_mx.tform.php', $client_id, $params); } //* Update a record - public function dns_mx_update($session_id, $client_id, $primary_id, $params) + public function dns_mx_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_mx_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_mx.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_mx_delete($session_id, $primary_id) + public function dns_mx_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_mx_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_mx.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -591,34 +609,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_ns_add($session_id, $client_id, $params) + public function dns_ns_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ns_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_ns.tform.php', $client_id, $params); } //* Update a record - public function dns_ns_update($session_id, $client_id, $primary_id, $params) + public function dns_ns_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ns_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_ns.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_ns_delete($session_id, $primary_id) + public function dns_ns_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ns_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_ns.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -639,34 +660,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_ptr_add($session_id, $client_id, $params) + public function dns_ptr_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ptr_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_ptr.tform.php', $client_id, $params); } //* Update a record - public function dns_ptr_update($session_id, $client_id, $primary_id, $params) + public function dns_ptr_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ptr_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_ptr.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_ptr_delete($session_id, $primary_id) + public function dns_ptr_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_ptr_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_ptr.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -687,34 +711,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_rp_add($session_id, $client_id, $params) + public function dns_rp_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_rp_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_rp.tform.php', $client_id, $params); } //* Update a record - public function dns_rp_update($session_id, $client_id, $primary_id, $params) + public function dns_rp_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_rp_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_rp.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_rp_delete($session_id, $primary_id) + public function dns_rp_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_rp_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_rp.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -735,34 +762,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_srv_add($session_id, $client_id, $params) + public function dns_srv_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_srv_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_srv.tform.php', $client_id, $params); } //* Update a record - public function dns_srv_update($session_id, $client_id, $primary_id, $params) + public function dns_srv_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_srv_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_srv.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_srv_delete($session_id, $primary_id) + public function dns_srv_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_srv_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_srv.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -783,34 +813,37 @@ class remoting_dns extends remoting { } //* Add a record - public function dns_txt_add($session_id, $client_id, $params) + public function dns_txt_add($session_id, $client_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_txt_add')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $this->insertQuery('../dns/form/dns_txt.tform.php', $client_id, $params); } //* Update a record - public function dns_txt_update($session_id, $client_id, $primary_id, $params) + public function dns_txt_update($session_id, $client_id, $primary_id, $params, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_txt_update')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + if($update_serial) $this->increase_serial($session_id, $client_id, $params); $affected_rows = $this->updateQuery('../dns/form/dns_txt.tform.php', $client_id, $primary_id, $params); return $affected_rows; } //* Delete a record - public function dns_txt_delete($session_id, $primary_id) + public function dns_txt_delete($session_id, $primary_id, $update_serial=false) { if(!$this->checkPerm($session_id, 'dns_txt_delete')) { throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.'); return false; } $affected_rows = $this->deleteQuery('../dns/form/dns_txt.tform.php', $primary_id); + if($update_serial) $this->increase_serial($session_id, $client_id, $params); return $affected_rows; } @@ -884,6 +917,26 @@ class remoting_dns extends remoting { } } + private function increase_serial($session_id, $client_id, $params) { + $soa = $this->dns_zone_get($session_id, $params['zone']); + $serial=$soa['serial']; + $serial_date = intval(substr($serial, 0, 8)); + $count = intval(substr($serial, 8, 2)); + $current_date = date("Ymd"); + if($serial_date >= $current_date){ + $count += 1; + if ($count > 99) { + $serial_date += 1; + $count = 0; + } + $count = str_pad($count, 2, "0", STR_PAD_LEFT); + $new_serial = $serial_date.$count; + } else { + $new_serial = $current_date.'01'; + } + $soa['serial'] = $new_serial; + $this->dns_zone_update($session_id, $client_id, $soa['id'], $soa); + } } ?> diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index a5dfd52b19926828b736124a1a4e7fb3c55f9a36..8522ebc6fd802cd07ebd32936b5359de22d27ad8 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -142,11 +142,13 @@ class remoting { // get the ip for a hostname unset($allowed_ips[$i]); $temp=dns_get_record($allowed, DNS_A+DNS_AAAA); - foreach($temp as $t) { - if(isset($t['ip'])) $allowed_ips[] = $t['ip']; - if(isset($t['ipv6'])) $allowed_ips[] = $t['ipv6']; + if(is_array($temp) && !empty($temp)) { + foreach($temp as $t) { + if(isset($t['ip'])) $allowed_ips[] = $t['ip']; + if(isset($t['ipv6'])) $allowed_ips[] = $t['ipv6']; + } + unset($temp); } - unset($temp); } } $allowed_ips[] = '127.0.0.1'; diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index 868c6bdbc90aba82334dfa9bf01be5b8ca9b033e..f5f4f8fb47e0d129bc44dc6227a5d113cfe1fb37 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -13339,6 +13339,7 @@ class SimplePie_Parse_Date // Convert the number of seconds to an integer, taking decimals into account $second = round($match[6] + (float)$match[7] / pow(10, (int)strlen($match[7]))); + $second = @round($match[6] + $match[7] / @pow(10, strlen($match[7]))); return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; } diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng index a1503b2677cd52858cb1b70349ca4201f5ed5a7e..bcf71df1a66bf23d487782db3a48acde3d70ca17 100644 --- a/interface/lib/lang/ru.lng +++ b/interface/lib/lang/ru.lng @@ -145,7 +145,7 @@ $wb['strength_2'] = 'Средний'; $wb['strength_3'] = 'Хороший'; $wb['strength_4'] = 'Стойкий'; $wb['strength_5'] = 'Очень стойкий'; -$wb['weak_password_txt'] = 'Выбранный пароль не соответствует требованиям безопасности. Он должен быть как минимум {chars} символов в длину и стойкость \"{strength}\".'; +$wb['weak_password_txt'] = 'Выбранный пароль не соответствует требованиям безопасности. Он должен быть как минимум {chars} символов в длину и стойкость \\"{strength}\\".'; $wb['weak_password_length_txt'] = 'Выбранный пароль не соответствует требованиям безопасности. Он должен быть как минимум {chars} символов в длину.'; $wb['security_check1_txt'] = 'Проверка разрешений безопасности:'; $wb['security_check2_txt'] = 'не удалось.'; diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 18a55dda08018068f18ba77d84938e448370066a..ad4171c3168bc0a3539b3b27413917ddd0dc8c83 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -190,7 +190,7 @@ $form["tabs"]['server'] = array( 'validators' => array( 0 => array('type' => 'NOTEMPTY', 'errmsg' => 'tmpdir_path_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => "/^\/[a-zA-Z0-9\.\-\_\/]{4,128}$/", + 'regex' => "/^\/[a-zA-Z0-9\.\-\_\/]{3,128}$/", 'errmsg'=> 'tmpdir_path_error_regex'), ), 'value' => '', @@ -423,6 +423,17 @@ $form["tabs"]['server'] = array( 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), + 'log_retention' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISPOSITIVE', + 'errmsg'=> 'log_retention_error_ispositive'), + ), + 'default' => '30', + 'value' => '', + 'width' => '4', + 'maxlength' => '4' + ), 'migration_mode' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', @@ -848,6 +859,12 @@ $form["tabs"]['web'] = array( 'width' => '40', 'maxlength' => '255' ), + 'nginx_enable_pagespeed' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), 'nginx_vhost_conf_dir' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', @@ -938,6 +955,12 @@ $form["tabs"]['web'] = array( 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), + 'logging' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => 'yes', + 'value' => array('yes' => 'Yes', 'anon' => 'Anonymize IP', 'no' => 'No') + ), 'overtraffic_notify_admin' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php index c94bb38c015aa50ea9b1626c17f410f34692a62b..67e54ec6b5dacd7d085100e11dcd60d400b347be 100644 --- a/interface/web/admin/form/server_php.tform.php +++ b/interface/web/admin/form/server_php.tform.php @@ -124,6 +124,13 @@ $form["tabs"]['php_name'] = array ( 'width' => '40', 'maxlength' => '255' ), + 'active' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), + //################################# // ENDE Datenbankfelder //################################# diff --git a/interface/web/admin/lib/lang/ar_remote_user.lng b/interface/web/admin/lib/lang/ar_remote_user.lng index 935e432bf3097a9d980f0b92f8fe2e5121187bf3..d0504005e310ec5464c4c9fda2eb637bd008f75a 100644 --- a/interface/web/admin/lib/lang/ar_remote_user.lng +++ b/interface/web/admin/lib/lang/ar_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 69c6427c68c3d6ee2b2e10d547effc4a6302e94b..683efce3126486df43aa775c95635b3cf5d47b3e 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/ar_server_php.lng +++ b/interface/web/admin/lib/lang/ar_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng index 93988a091191dcebd70066e6bab74cd91afd2a82..dcbc4f4727145c78a9a6a70b4ac3cca5b3ecc0c7 100644 --- a/interface/web/admin/lib/lang/ar_users.lng +++ b/interface/web/admin/lib/lang/ar_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/bg_remote_user.lng b/interface/web/admin/lib/lang/bg_remote_user.lng index 38dca5ab27d7077440fced6292962e63c0e3803b..6eac31e4fe33008bf87047588e55969d450fa76c 100644 --- a/interface/web/admin/lib/lang/bg_remote_user.lng +++ b/interface/web/admin/lib/lang/bg_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 88d19cd60a9f3be6b75752795a357569ba9a545b..277cee8b9f9e736b000bd14856674982c4558f9a 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/bg_server_php.lng +++ b/interface/web/admin/lib/lang/bg_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng index 468e0ac218d4ba4bbb77513c0ea96820cce6a67f..e8dc631a59b6d652228c0eb9d311c93cdc63daba 100644 --- a/interface/web/admin/lib/lang/bg_users.lng +++ b/interface/web/admin/lib/lang/bg_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/br.lng b/interface/web/admin/lib/lang/br.lng index 9780b0a0b23acb5a1f0842ff77cc4f74d8ce6f5e..c4df3fe58bcaf2acb7aa86fb208e245366be4383 100644 --- a/interface/web/admin/lib/lang/br.lng +++ b/interface/web/admin/lib/lang/br.lng @@ -26,7 +26,6 @@ $wb['FastCGI'] = 'FastCGI'; $wb['Jailkit'] = 'Jailkit'; $wb['Rescue'] = 'Manutenção'; $wb['Server IP addresses'] = 'Endereço IP do servidor'; -$wb['Server IPv4 mapping'] = 'Mapeamento IPv4 do servidor'; $wb['Additional PHP Versions'] = 'Versões adicionais do php'; $wb['Firewall'] = 'Firewall'; $wb['Interface'] = 'Interface'; diff --git a/interface/web/admin/lib/lang/br_remote_user.lng b/interface/web/admin/lib/lang/br_remote_user.lng index 7479efe19d71b60ac977585b16b1445f7d6e8036..95657a283d4c41f737d5915bec2529742bd6a787 100644 --- a/interface/web/admin/lib/lang/br_remote_user.lng +++ b/interface/web/admin/lib/lang/br_remote_user.lng @@ -6,59 +6,45 @@ $wb['username_error_unique'] = 'O nome de usuário deve ser exclusivo'; $wb['username_error_empty'] = 'O nome de usuário não pode estar em branco'; $wb['password_error_empty'] = 'A senha não pode estar em branco'; $wb['password_strength_txt'] = 'Dificuldade da senha'; -$wb['Server functions'] = 'Funções de servidor'; -$wb['Record permission changes'] = 'Permissão de alteração de registros'; -$wb['Domaintool functions'] = 'Funções de domínios'; -$wb['Quota functions'] = 'Funções de cotas'; $wb['Mail domain functions'] = 'Funções de domínios de e-mail'; -$wb['Mail domain alias functions'] = 'Funções de apelidos de domínios de e-mail'; -$wb['Mail mailinglist functions'] = 'Funções de listas de e-mail'; $wb['Mail user functions'] = 'Funções de usuários de e-mail'; $wb['Mail alias functions'] = 'Funções de apelidos de domínio de e-mail'; $wb['Mail forward functions'] = 'Funções de encaminhamento de e-mail'; $wb['Mail catchall functions'] = 'Funções de de contas cata tudo'; $wb['Mail transport functions'] = 'Funções de transporte de e-mail'; -$wb['Mail relay functions'] = 'Funções de retransmissão de e-mail'; $wb['Mail whitelist functions'] = 'Funções de lista branca de e-mail'; $wb['Mail blacklist functions'] = 'Funções de lista negra de e-mail'; $wb['Mail spamfilter user functions'] = 'Funções de filtros anti-spam para contas de e-mail'; $wb['Mail spamfilter policy functions'] = 'Funções de política de anti-spam para contas de e-mail'; $wb['Mail fetchmail functions'] = 'Funções de contas de busca de e-mails'; -$wb['Mail spamfilter whitelist functions'] = 'Funções de lista branca para filtros anti-spam'; -$wb['Mail spamfilter blacklist functions'] = 'Funções de lista negra para filtros anti-spam'; $wb['Mail user filter functions'] = 'Funções de filtro de e-mails para contas de e-mail'; -$wb['Mail Backup functions'] = 'Funções de backup de e-mails'; $wb['Mail filter functions'] = 'Funções de filtros de e-mail'; -$wb['Monitor functions'] = 'Funções de monitoramento'; $wb['Client functions'] = 'Funções de cliente'; $wb['Sites cron functions'] = 'Funções de tarefas no cron para sites'; $wb['Sites database functions'] = 'Funções de banco de dados para sites'; -$wb['Sites Protected folder functions'] = 'Funções de pasta protegida para sites'; $wb['Sites FTP-User functions'] = 'Funções de usuários ftp para sites'; $wb['Sites Shell-User functions'] = 'Funções de usuários shell para sites'; $wb['Sites Domain functions'] = 'Funções de domínios de sites'; -$wb['Sites Backup functions'] = 'Funções de backup para sites'; $wb['Sites Aliasdomain functions'] = 'Função de apelidos de domínio de sites'; $wb['Sites Subdomain functions'] = 'Função de subdomínio de sites'; -$wb['Sites APS functions'] = 'Funções de aplicativos para sites'; $wb['DNS zone functions'] = 'Funções de zona dns'; $wb['DNS a functions'] = 'Funções de registro A dns'; $wb['DNS aaaa functions'] = 'Funções de registro AAAA dns'; $wb['DNS alias functions'] = 'Funções de registro Alias dns'; $wb['DNS cname functions'] = 'Funções de registro CNAME dns'; -$wb['DNS ds functions'] = 'Funções de registro DS dns'; $wb['DNS hinfo functions'] = 'Funções de registro HINFO dns'; -$wb['DNS loc functions'] = 'Funções de registro LOC dns'; $wb['DNS mx functions'] = 'Funções de registro MX dns'; -$wb['DNS tlsa functions'] = 'Funções de registro TLSA dns'; $wb['DNS ns functions'] = 'Funções de registro NS dns'; $wb['DNS ptr functions'] = 'Funções de registro PTR dns'; $wb['DNS rp functions'] = 'Funções de registro RP dns'; $wb['DNS srv functions'] = 'Funções de registro SRV dns'; $wb['DNS txt functions'] = 'Funções de registro TXT dns'; -$wb['OpenVZ VM functions'] = 'Funções de máquinas virtuais do OPENVZ'; $wb['generate_password_txt'] = 'Gerar senha'; $wb['repeat_password_txt'] = 'Repetir senha'; $wb['password_mismatch_txt'] = 'A senhas não coincidem.'; $wb['password_match_txt'] = 'A senhas coincidem.'; +$wb['remote_access_txt'] = 'Acesso remoto'; +$wb['remote_ips_txt'] = 'Endereço(s) IPs ou nome do servidor com acesso remoto (separado por vírgula ou em branco para qualquer um)'; +$wb['remote_user_error_ips'] = 'Ao menos um endereço IP ou nome do servidor é inválido.'; +$wb['Mail mailing list functions'] = 'Mail mailinglist functions'; ?> diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 2e60a761a712c61b6901eeaa6d9647cec507cfb8..a46db9f1c9868b1d79ea11c5c4351606c04143b3 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'Dificuldade do DKIM'; $wb['php_ini_check_minutes_txt'] = 'Verificar modificações do php.ini a cada N minutos'; $wb['php_ini_check_minutes_error_empty'] = 'Por favor, insira um valor de quantas vezes o php.ini deve ser verificado por modificações.'; $wb['php_ini_check_minutes_info_txt'] = '0 = sem verificação'; -$wb['enable_spdy_txt'] = 'Tornar SPDY disponível'; +$wb['enable_spdy_txt'] = 'Tornar SPDY/HTTP2 disponível'; $wb['web_settings_txt'] = 'Servidor de páginas'; $wb['xmpp_server_txt'] = 'Servidor XMPP'; $wb['xmpp_use_ipv6_txt'] = 'Usar IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Hora do backup'; $wb['skip_le_check_txt'] = 'Ignorar verificação do Lets Encrypt'; $wb['migration_mode_txt'] = 'Habilitar modo de migração do servidor'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng index 21e199652d5ea6e228e218144d93b289ef917510..459b4d9e0ccd25a92a356d622d9a6148eee1deb3 100644 --- a/interface/web/admin/lib/lang/br_server_php.lng +++ b/interface/web/admin/lib/lang/br_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Caminho do diretório do php.ini'; $wb['php_fpm_init_script_txt'] = 'Caminho do script de inicialização do PHP-FPM'; $wb['php_fpm_ini_dir_txt'] = 'Caminho do diretório do php.ini'; $wb['php_fpm_pool_dir_txt'] = 'Caminho do diretório de faixas (pool) do PHP-FPM'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index 46b496d89c3390446f20d3caa9a50e15366710d1..70430a6063a900f26f192efec4311436566d12bb 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -67,7 +67,7 @@ $wb['customer_no_template_error_regex_txt'] = 'O número do gabarito do cliente $wb['customer_no_start_txt'] = 'Valor inicial do código do cliente'; $wb['customer_no_counter_txt'] = 'Contador de código do cliente'; $wb['session_timeout_txt'] = 'Duração da sessão (minutos)'; -$wb['session_allow_endless_txt'] = 'Habilitar "Manter-me conectado"'; +$wb['session_allow_endless_txt'] = 'Habilitar \"Manter-me conectado\"'; $wb['min_password_length_txt'] = 'Comprimento mínimo da senha'; $wb['min_password_strength_txt'] = 'Dificuldade mínima da senha'; $wb['company_name_txt'] = 'Nome da empresa no título da página'; diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng index b1be5f6da73eba9a57786b33cf61b2e4f8a90d20..d16bcf1cb181b47daf13787d167c19727e7600e1 100644 --- a/interface/web/admin/lib/lang/br_users.lng +++ b/interface/web/admin/lib/lang/br_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'A senhas coincidem.'; $wb['username_error_collision'] = 'O nome do usuário não pode conter as palavras reservadas -web- ou -web- seguidas por um número.'; $wb['client_not_admin_err'] = 'Um usuário definido como cliente não pode ser configurado com o tipo: admin (administrador).'; $wb['lost_password_function_txt'] = 'Função reconfigurar senha perdida disponível'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/ca_remote_user.lng b/interface/web/admin/lib/lang/ca_remote_user.lng index 4868e39bdbcb40324dc0acc1ecaa41fee90b5aeb..2fc633b555d240c15457f3ec2fdd48d9e55a756e 100644 --- a/interface/web/admin/lib/lang/ca_remote_user.lng +++ b/interface/web/admin/lib/lang/ca_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 57de732bfa4d41b6e5567f0aabf0a43c9ca3e170..3d8491cf99db921477932d6479447299cc3db38d 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -264,7 +264,7 @@ $wb['network_filesystem_txt'] = 'Network Filesystem'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/ca_server_php.lng +++ b/interface/web/admin/lib/lang/ca_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/ca_users.lng b/interface/web/admin/lib/lang/ca_users.lng index 93988a091191dcebd70066e6bab74cd91afd2a82..dcbc4f4727145c78a9a6a70b4ac3cca5b3ecc0c7 100644 --- a/interface/web/admin/lib/lang/ca_users.lng +++ b/interface/web/admin/lib/lang/ca_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng deleted file mode 100644 index 3f8e8491fc0aa2ebcb3336d30b96a37d633639d2..0000000000000000000000000000000000000000 --- a/interface/web/admin/lib/lang/cz_login_as.lng +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index 17c4f05b5627f710aae5d2d114ce88149c2906d4..aeacc442ca975da331d2d6df8d3248a5fb5a0465 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 3bf09679ca915525a75492f45dae7f14d6c9708b..204828d7a63a156065d1cc8d053f04ec2fcfd4d8 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -143,7 +143,7 @@ $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM adresář pro socket je prázdn $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 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 službu 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í nastartuje službu MySQL automaticky znovu !'; +$wb['rescue_description_txt'] = 'Informace: Pokud chcete např. vypnout MySQL službu 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í nastartuje službu MySQL automaticky znovu !'; $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'] = 'Nastavení oprávnění složky při aktualizaci'; @@ -261,7 +261,7 @@ $wb['disabled_txt'] = 'Vypnuto'; $wb['php_ini_check_minutes_txt'] = 'Provádět kontrolu změny obsahu souboru php.ini každých X minut'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Použít IPv6'; @@ -283,4 +283,12 @@ $wb['hostname_error_regex'] = 'Neplatný název hostitele.'; $wb['backup_time_txt'] = 'Spustit zálohovaní v'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng index 10aba05dd76089c892ff4ee5fe88a7f4bce5e210..615431c3559ed694eda6fb9aff9d2bb5845943cc 100644 --- a/interface/web/admin/lib/lang/cz_server_php.lng +++ b/interface/web/admin/lib/lang/cz_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři'; $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script'; $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'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng index 443ff2ec828001708fb38947006adbf6383fdd32..b517d7329096cb130e610db0e968d13e0ce4cefc 100644 --- a/interface/web/admin/lib/lang/cz_users.lng +++ b/interface/web/admin/lib/lang/cz_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Hesla se shodují.'; $wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 7de8ee6776fcce906659e330a735913fdb92803d..fd8cbc40b85c0fd23dc9c16cead465883f73b53e 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -272,7 +272,7 @@ $wb['php_ini_check_minutes_txt'] = 'Prüfe php.ini alle X Minuten auf Änderunge $wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie oft die php.ini auf Änderungen geprüft werden soll.'; $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung'; $wb['php_handler_txt'] = 'Standard-PHP-Handler'; -$wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung'; +$wb['enable_spdy_txt'] = 'Stellt SPDY/HTTP2 zur Verfügung'; $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN'; $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['disabled_txt'] = 'Disabled'; @@ -292,4 +292,9 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin'; $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng index 9b26ea3c6d4feb878dc80518474e488524352ba6..67dad7064ae56db3e87a1e8e2885dcaee572ffe2 100644 --- a/interface/web/admin/lib/lang/de_server_php.lng +++ b/interface/web/admin/lib/lang/de_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis'; $wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script'; $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis'; $wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis'; +$wb['active_txt'] = 'Aktiv'; ?> diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng index db37a605bc984ed6a708e6bc8802d979a397d3c8..255e7bca0bfa5b7161d651766dd3d2247198c327 100644 --- a/interface/web/admin/lib/lang/de_users.lng +++ b/interface/web/admin/lib/lang/de_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; $wb['username_error_collision'] = 'Der Benutzername darf nicht web oder web gefolgt von einer Zahl sein.'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Passwort vergessen Funktion steht zur Verfügung'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/dk_remote_user.lng b/interface/web/admin/lib/lang/dk_remote_user.lng index 710c239e008b9d3ee78716dfbafc557cf7fc3f1a..80f61c8929202a85fbd89c972fb8bd111c840653 100644 --- a/interface/web/admin/lib/lang/dk_remote_user.lng +++ b/interface/web/admin/lib/lang/dk_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Generer Adgangskode'; $wb['repeat_password_txt'] = 'Gentage Adgangskode'; $wb['password_mismatch_txt'] = 'Adgangskoderne stemmer ikke overens.'; $wb['password_match_txt'] = 'Adgangskoderne stemmer overens.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index b7e9b3f831ae19fd4973c41a2ac02ee85b9dd75a..fcf4d2007e790f81479e79b3e071542c49d9b1a2 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -265,7 +265,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN'; $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng index cc821ec2f2335a34c0dbd27e283916cb20842df2..ff8586f5ea7b5b9fb50d821c59fb34428d3a3436 100644 --- a/interface/web/admin/lib/lang/dk_server_php.lng +++ b/interface/web/admin/lib/lang/dk_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Sti til php.ini mappe'; $wb['php_fpm_init_script_txt'] = 'Sti til PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Sti til php.ini mappe'; $wb['php_fpm_pool_dir_txt'] = 'Sti til PHP-FPM pool mappe'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/dk_users.lng b/interface/web/admin/lib/lang/dk_users.lng index be8947ba20f84950924f4785b56d14cbc0456268..2e86ab4ca9b497646bc4a2759eca5c379940d9c4 100644 --- a/interface/web/admin/lib/lang/dk_users.lng +++ b/interface/web/admin/lib/lang/dk_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Adgangskoderne stemmer overens.'; $wb['username_error_collision'] = 'Brugernavn må ikke være web eller web plus et tal.\\"'; $wb['client_not_admin_err'] = 'En bruger der hører til en klient kan ikke indstilles til typen: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng index ddffd7072da6b080d51310e9f64bc86f48d74ea5..c38f1de2f05ff525cbcc2f89e13327e71078d4e2 100644 --- a/interface/web/admin/lib/lang/el_remote_user.lng +++ b/interface/web/admin/lib/lang/el_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 00266d17620295e0c942853dbcd8b81c146f79e9..f7c475c5705cbe2e6868f0613bcdaa0ed70a5d91 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/el_server_php.lng +++ b/interface/web/admin/lib/lang/el_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index 7351d6522aec4c8b703e486a40763caab156cc69..f0307b95eca8d9ab65a653fc96032eb67b64e0a4 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index ac8f35f8510b0eaead4ed44e80499ab9e80169d4..d6c0737c3a4d6ccab012b61fe53fcf709687668b 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -274,7 +274,7 @@ $wb['network_filesystem_txt'] = 'Network Filesystem'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_daemon_txt'] = 'XMPP Daemon'; @@ -294,4 +294,9 @@ $wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled"; $wb["mailinglist_manager_txt"] = 'Mailinglist Manager'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/en_server_php.lng +++ b/interface/web/admin/lib/lang/en_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng index 9c57f1db8bbbb4bf5acf4f5216a452252e880c47..81f3742a35d3774757a17ebf57390fe4509ce9dd 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number."'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/es_remote_user.lng b/interface/web/admin/lib/lang/es_remote_user.lng index 3eab509426843bc733ca71a8af02ffa2eb56b49e..7cefa1e5dbebcabb655413e0f1f8c91ab379edbe 100755 --- a/interface/web/admin/lib/lang/es_remote_user.lng +++ b/interface/web/admin/lib/lang/es_remote_user.lng @@ -44,4 +44,7 @@ $wb['Sites Subdomain functions'] = 'Funciones para sub-dominios'; $wb['username_error_empty'] = 'El nombre de usuario no puede esta vacío'; $wb['username_error_unique'] = 'En nombre de usuario debe ser único'; $wb['username_txt'] = 'Nombre de usuario'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index a0ce5ddbe4a9c93e2677996c0e9cb5cda31f7f9a..aaee15ec0b2f19324c89a682f71d068731fcd16d 100755 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -62,7 +62,7 @@ $wb['do_not_try_rescue_mongodb_txt'] = 'Deshabilitar monitorización de MongoDB' $wb['do_not_try_rescue_mysql_txt'] = 'Deshabilitar monitorización de MySQL'; $wb['enable_ip_wildcard_txt'] = 'Activar comodín IP (*)'; $wb['enable_sni_txt'] = 'Habilitar SNI'; -$wb['enable_spdy_txt'] = 'Hacer que SPDY esté disponible'; +$wb['enable_spdy_txt'] = 'Hacer que SPDY/HTTP2 esté disponible'; $wb['fastcgi_alias_error_empty'] = 'El alias de FastCGI está vacío.'; $wb['fastcgi_alias_error_regex'] = 'El alias de fastcgi es inválido.'; $wb['fastcgi_alias_txt'] = 'Alias de FastCGI'; @@ -283,4 +283,12 @@ $wb['xmpp_use_ipv6_txt'] = 'Usar IPv6'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng index 4d063113bbb3479cf73d7236df997a10c19e5c2b..762fa0ed8c90c67fd1bfa4a9765858f3ce4da7a2 100755 --- a/interface/web/admin/lib/lang/es_server_php.lng +++ b/interface/web/admin/lib/lang/es_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fpm_init_script_txt'] = 'Ruta al archivo de arranque de PHP-FPM'; $wb['php_fpm_pool_dir_txt'] = 'Ruta al directorio de procesos de PHP-FPM'; $wb['server_id_txt'] = 'Servidor'; $wb['server_php_name_error_empty'] = 'El campo Nombre no puede estar vacío.'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng index 1e3690b977f62f712da41d9e25e958a444024d37..65baeb666f1930be22896b18c4fce3ad52b8622d 100755 --- a/interface/web/admin/lib/lang/es_users.lng +++ b/interface/web/admin/lib/lang/es_users.lng @@ -32,4 +32,5 @@ $wb['username_error_collision'] = 'El nombre de usuario no puede ser el del web $wb['username_txt'] = 'Nombre de usuario'; $wb['username_unique'] = 'Ya existe un usuario con ese nombre de usuario.'; $wb['vorname_txt'] = 'Primer nombre'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/fi_remote_user.lng b/interface/web/admin/lib/lang/fi_remote_user.lng index 9e0abc7d75b350e671fd17c2a4249058cbde32e7..2ae3420d621c94c3168d9b04d73806aae6e37d2c 100644 --- a/interface/web/admin/lib/lang/fi_remote_user.lng +++ b/interface/web/admin/lib/lang/fi_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 6c44a61b224d4f4981c7c069294c3bd10ae861e1..99c1524dc56c8df911061b98f08d30c4f573e5a6 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/fi_server_php.lng +++ b/interface/web/admin/lib/lang/fi_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng index 24968c8fd0dcfed943288d168baf3a20829068d9..199601f5207d7889a1aaffe66660cdc77e990a35 100755 --- a/interface/web/admin/lib/lang/fi_users.lng +++ b/interface/web/admin/lib/lang/fi_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/fr_remote_user.lng b/interface/web/admin/lib/lang/fr_remote_user.lng index 55d6e16b3deb9928387b5ddafbf9136a48e112d2..1594e60fb4c8baacc2e1e0cba5152de0e4a73419 100644 --- a/interface/web/admin/lib/lang/fr_remote_user.lng +++ b/interface/web/admin/lib/lang/fr_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Générer un mot de passe'; $wb['repeat_password_txt'] = 'Répéter le mot de passe'; $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.'; $wb['password_match_txt'] = 'Les mots de passe correspondent.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 864f8dcfb9344dc920c7dfc824d2f5fd7bafaf4e..43e67450ec7bce990aa648c8a2230c41a8e0cffd 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -264,7 +264,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/fr_server_php.lng +++ b/interface/web/admin/lib/lang/fr_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng index a20f0a6f0ddc16e87a45c3bc9e3360bbc0698b1c..6cc3e116b4dd6e0533bd76f9ddf34e0f7adcdbcb 100644 --- a/interface/web/admin/lib/lang/fr_users.lng +++ b/interface/web/admin/lib/lang/fr_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Les mots de passe correspondent.'; $wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par web ou web suivi d\'un nombre.'; $wb['client_not_admin_err'] = 'Un utilisateur affilié à un client ne peut pas être changé en type admin'; $wb['lost_password_function_txt'] = 'La fonction mot de passe oublié est disponible'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/hr_remote_user.lng b/interface/web/admin/lib/lang/hr_remote_user.lng index f932fc22962e5201285effb8cebc0d881fc50dd4..069177e5ed09db186cdbb8dc2de65f498ab5e031 100644 --- a/interface/web/admin/lib/lang/hr_remote_user.lng +++ b/interface/web/admin/lib/lang/hr_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Generiraj šifru'; $wb['repeat_password_txt'] = 'Ponovi šifru'; $wb['password_mismatch_txt'] = 'Šifre nisu identične.'; $wb['password_match_txt'] = 'Šifre su identične.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 6434d30e3e38965d6e4ba14be405972d9ec0a33e..797f0eb71f0e209ba2688a43a10aba55d22d07b7 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng index 585332f6d0605ac957e9488f9191940578cab8a0..5bfc1dd6d20d59cb3f1f28dda7755c122a84c1ad 100644 --- a/interface/web/admin/lib/lang/hr_server_php.lng +++ b/interface/web/admin/lib/lang/hr_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Putanja do php.ini direktorija'; $wb['php_fpm_init_script_txt'] = 'Putanja do PHP-FPM init skripte'; $wb['php_fpm_ini_dir_txt'] = 'Putanja do php.ini direktorija'; $wb['php_fpm_pool_dir_txt'] = 'Putanja do PHP-FPM pool direktorija'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng index 15e12a52f083d74604507a33e352d6eaeb1116cf..7be3f968f27d22f0a6c1aef99cd5312dc2593d80 100644 --- a/interface/web/admin/lib/lang/hr_users.lng +++ b/interface/web/admin/lib/lang/hr_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Šifre su identične.'; $wb['username_error_collision'] = 'Korisničko ime ne može biti web ili web sa brojem.\\"'; $wb['client_not_admin_err'] = 'Korisnik koji je u grupi klijenti ne može biti admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/hu_remote_user.lng b/interface/web/admin/lib/lang/hu_remote_user.lng index a9767ac77b4d7053c8184ff6bcd19a7854139549..bae9d82f53ceaac588e1baa311655edec36fc7cb 100644 --- a/interface/web/admin/lib/lang/hu_remote_user.lng +++ b/interface/web/admin/lib/lang/hu_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index ec2476f0a8ecfd072c4e267dccdfa0aadd262012..04370d1b4d021e6e1a53676ed04f6bcba770623e 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/hu_server_php.lng +++ b/interface/web/admin/lib/lang/hu_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng index 126821da4424c163962fd8251e598a79cb7d1df1..e2cf25fb79521f342e6a167e339f2fa1fdb0109d 100644 --- a/interface/web/admin/lib/lang/hu_users.lng +++ b/interface/web/admin/lib/lang/hu_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/id_remote_user.lng b/interface/web/admin/lib/lang/id_remote_user.lng index f5d44a8af1b3919cda834824d142ff00c992496c..cc6efb627ac03112e9204fcb1299126812d0da66 100644 --- a/interface/web/admin/lib/lang/id_remote_user.lng +++ b/interface/web/admin/lib/lang/id_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 1c4e088457e534cfefa1851445354f88224903d8..2993c5c5993d9d2ee0ea558363abdfcee01c2ae2 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/id_server_php.lng +++ b/interface/web/admin/lib/lang/id_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng index 72641831d79c9dd6bc4409bb457c61163dc597e6..f9e961192c09a9bc6e68ccb8d0c2a90e68e8f1ec 100644 --- a/interface/web/admin/lib/lang/id_users.lng +++ b/interface/web/admin/lib/lang/id_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/it_remote_user.lng b/interface/web/admin/lib/lang/it_remote_user.lng index 790d59f5d56f1c42e2972752ee3363d0c77c56a5..caef58a8c68b35ac6445cf6ec47485f16c89c985 100644 --- a/interface/web/admin/lib/lang/it_remote_user.lng +++ b/interface/web/admin/lib/lang/it_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Genera Password'; $wb['repeat_password_txt'] = 'Ripeti Password'; $wb['password_mismatch_txt'] = 'Le password non coincidono.'; $wb['password_match_txt'] = 'Le password coincidono.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 1d0f5a865061ec6661af2b3f1b543cf5ab4b9e43..5db4de114c93400f2fc30484725e6791b67953a3 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -264,7 +264,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -284,4 +284,12 @@ $wb['backup_time_txt'] = 'Backup time'; $wb["mailinglist_manager_txt"] = 'Gestore delle Liste' $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng index 1b8d4ffc7408a81bca113cf19776270e24095842..805528f376d582be160fd802b36c26530f8b3e22 100644 --- a/interface/web/admin/lib/lang/it_server_php.lng +++ b/interface/web/admin/lib/lang/it_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Percorso per php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Percorso per PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Percorso per php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Percorso per PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 4c819427b7d95b6478de481d69c79f23e99476d2..1bde73a67ba192ed59c1f0100ddb116fa3dbfb61 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Le password coincidono.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/ja_remote_user.lng b/interface/web/admin/lib/lang/ja_remote_user.lng index fcd617151bcf7f7bc1749588dd6f839613ac4550..2b9ce2bbf046a25245ffce724be6aa0053488d5a 100644 --- a/interface/web/admin/lib/lang/ja_remote_user.lng +++ b/interface/web/admin/lib/lang/ja_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 639d5578053a937ca4c3a67dc98c5f83b96cbfd7..353aaa809effdd4fd6299782c811f94a7c8ee149 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/ja_server_php.lng +++ b/interface/web/admin/lib/lang/ja_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng index 7f16911b75e1feb96ee6b2b2b1178490ee631950..64f8339ffa9a4c9bbfbad023cd10cc3b96754089 100644 --- a/interface/web/admin/lib/lang/ja_users.lng +++ b/interface/web/admin/lib/lang/ja_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 914600a59201c9dbf2a3b150bd8119f104053b80..da771c9eb3c9f247069f30ea500564e351d71c11 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -292,4 +292,12 @@ $wb['mailinglist_manager_txt'] = 'Mailinglist Manager'; $wb['backup_tmp_txt'] = 'Backup tijdelijke map voor zip'; $wb['tmpdir_path_error_empty'] = 'tmp-dir map is leeg.'; $wb['tmpdir_path_error_regex'] = 'Ongeldige tmp-dir map.'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/nl_server_php.lng +++ b/interface/web/admin/lib/lang/nl_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 9634ee4bd6a44f01d52aef740be30efb4d9301a8..1e6d4ef586166171b18e799ce2f73c2d93d11bec 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng index 37065485aac8bdeaed34c7268e3bf0f089539b6c..5df48fb29b83bb7dbc667feb6af6963bc4332ea0 100644 --- a/interface/web/admin/lib/lang/pl_remote_user.lng +++ b/interface/web/admin/lib/lang/pl_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Generuj hasło'; $wb['repeat_password_txt'] = 'Powtórz hasło'; $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie'; $wb['password_match_txt'] = 'Hasła pasują'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index ae252eacf604329875bc200f2cc6d16f76e912c7..e2288f905071568df751efad9e132c19d11ccb5e 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng index 298eca65115f1a8c192353c7e1da4aeca3ecbfc0..5a7c7b6f9bdd90a5cec71911c98247687365ff46 100644 --- a/interface/web/admin/lib/lang/pl_server_php.lng +++ b/interface/web/admin/lib/lang/pl_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Ścieżka do katalogu php.ini'; $wb['php_fpm_init_script_txt'] = 'Ścieżka do skryptu inicjującego PHP-FPM'; $wb['php_fpm_ini_dir_txt'] = 'Ścieżka do katalogu php.ini'; $wb['php_fpm_pool_dir_txt'] = 'Ścieżka do katalogu pool PHP-FPM'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 8d227e08c352803906a06e9b3bbfe887e45b9c98..e6dfcb57b294981b74b31cf62f96e1c5ad80885e 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Hasła pasują'; $wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/pt_remote_user.lng b/interface/web/admin/lib/lang/pt_remote_user.lng index 5e6a4997d553b6fa709c03db8d6ef35384d98417..f23a6abd5c5b37f78b84f0ebe93cd570f65bd8f8 100644 --- a/interface/web/admin/lib/lang/pt_remote_user.lng +++ b/interface/web/admin/lib/lang/pt_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index f1f23ee0cd5a2489ec35b4c8a41519a45b499bd4..9d7fa04cde58088111acc1de90e7ab4394ce5565 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/pt_server_php.lng +++ b/interface/web/admin/lib/lang/pt_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng index f85071152902448f9fed9d8e215937098c4cf5e4..67cfe4f572cdce0ad2f301cf0000a069bf1f7a32 100644 --- a/interface/web/admin/lib/lang/pt_users.lng +++ b/interface/web/admin/lib/lang/pt_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/ro_remote_user.lng b/interface/web/admin/lib/lang/ro_remote_user.lng index 935e432bf3097a9d980f0b92f8fe2e5121187bf3..d0504005e310ec5464c4c9fda2eb637bd008f75a 100644 --- a/interface/web/admin/lib/lang/ro_remote_user.lng +++ b/interface/web/admin/lib/lang/ro_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index f6fbdeec8360c9b5de6f7cd434835f045984bb4a..e7787e186649a1219b4909ba63766987ad3ca562 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/ro_server_php.lng +++ b/interface/web/admin/lib/lang/ro_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng index 93988a091191dcebd70066e6bab74cd91afd2a82..dcbc4f4727145c78a9a6a70b4ac3cca5b3ecc0c7 100644 --- a/interface/web/admin/lib/lang/ro_users.lng +++ b/interface/web/admin/lib/lang/ro_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/ru_firewall.lng b/interface/web/admin/lib/lang/ru_firewall.lng index 23aeac01cda66c02aa00733aeb16f3a112830762..c30f26f2e89618ae52bafc636006a36d59624264 100644 --- a/interface/web/admin/lib/lang/ru_firewall.lng +++ b/interface/web/admin/lib/lang/ru_firewall.lng @@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Перечислить порты TCP через з $wb['udp_port_help_txt'] = 'Перечислить порты UDP через запятую'; $wb['active_txt'] = 'Активно'; $wb['firewall_error_unique'] = 'Уже есть такая запись брандмауэра для этого сервера.'; -$wb['tcp_ports_error_regex'] = 'Недопустимый символ в указании tcp порта. Корректные сиволы - цифры, ":" и ","'; -$wb['udp_ports_error_regex'] = 'Некорректный символ в указании UDP порта. Допустимые сиволы - цифры, ":" и ","'; +$wb['tcp_ports_error_regex'] = 'Недопустимый символ в указании tcp порта. Корректные сиволы - цифры, \":\" и \",\"'; +$wb['udp_ports_error_regex'] = 'Некорректный символ в указании UDP порта. Допустимые сиволы - цифры, \":\" и \",\"'; ?> diff --git a/interface/web/admin/lib/lang/ru_remote_user.lng b/interface/web/admin/lib/lang/ru_remote_user.lng index 9757a96e90ae7779720c415a05ddec8a4a284fce..2d556b0800746f8a59543fd95b05a69f5697260a 100644 --- a/interface/web/admin/lib/lang/ru_remote_user.lng +++ b/interface/web/admin/lib/lang/ru_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Создать пароль'; $wb['repeat_password_txt'] = 'Повторить пароль'; $wb['password_mismatch_txt'] = 'Пароли не совпадают.'; $wb['password_match_txt'] = 'Эти пароли совпадают.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index cbf98487abaa09aebd6a3600948d7f1ba208d237..eb004bcfc71fdeeeb6fd4b00a42c3111e9be7abe 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -152,7 +152,7 @@ $wb['php_fpm_socket_dir_error_empty'] = 'Каталог PHP-FPM сокета п $wb['try_rescue_txt'] = 'Включить мониторинг службы и перезапуск при сбое'; $wb['do_not_try_rescue_mysql_txt'] = 'Отключить мониторинг MySQL'; $wb['do_not_try_rescue_mail_txt'] = 'Отключить мониторинг Email'; -$wb['rescue_description_txt'] = 'Информация: Если вы хотите выключить MySQL, вы должны установить флажок "Отключить мониторинг MySQL" и подождать 2-3 минуты.
Если вы не подождёте 2-3 минуты, мониторинг будет пытаться перезапустить MySQL!'; +$wb['rescue_description_txt'] = 'Информация: Если вы хотите выключить MySQL, вы должны установить флажок \"Отключить мониторинг MySQL\" и подождать 2-3 минуты.
Если вы не подождёте 2-3 минуты, мониторинг будет пытаться перезапустить MySQL!'; $wb['enable_sni_txt'] = 'Включить SNI'; $wb['do_not_try_rescue_httpd_txt'] = 'Отключить мониторинг HTTPD'; $wb['set_folder_permissions_on_update_txt'] = 'Установить разрешения для папки на обновления'; @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'Стойкость DKIM'; $wb['php_ini_check_minutes_txt'] = 'Проверять изменения в PHP.ini файле каждые Х минут'; $wb['php_ini_check_minutes_error_empty'] = 'Пожалуйста, укажите значение, как часто php.ini должен быть проверен на изменения.'; $wb['php_ini_check_minutes_info_txt'] = '0 = не проверять'; -$wb['enable_spdy_txt'] = 'Сделать SPDY доступным'; +$wb['enable_spdy_txt'] = 'Сделать SPDY/HTTP2 доступным'; $wb['web_settings_txt'] = 'Web-сервер'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Использовать IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Время копирования'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng index 8189eed0755665dd4d6ba55355e17fdb1a414a9e..854b8a3c23ebb0a392d77f14bd1947c81f60e3dd 100644 --- a/interface/web/admin/lib/lang/ru_server_php.lng +++ b/interface/web/admin/lib/lang/ru_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Путь к каталогу php.ini FastCGI'; $wb['php_fpm_init_script_txt'] = 'Путь к скрипту нициализации PHP-FPM'; $wb['php_fpm_ini_dir_txt'] = 'Путь к каталогу php.ini PHP-FPM'; $wb['php_fpm_pool_dir_txt'] = 'Путь до каталога пула PHP-FPM'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index 4a604ddcdc195917cf145138481d36378e1a72b8..778e9e525ad51b69b46dfa4138a9615a88be81d5 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -1,5 +1,4 @@ diff --git a/interface/web/admin/lib/lang/se_remote_user.lng b/interface/web/admin/lib/lang/se_remote_user.lng index 1c77ba950bef3522453395f9014eb10d9eb477fc..657e5878f1ad5af6ea9fa6e5a470574164713430 100644 --- a/interface/web/admin/lib/lang/se_remote_user.lng +++ b/interface/web/admin/lib/lang/se_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Generera lösenord'; $wb['repeat_password_txt'] = 'Upprepa lösenord'; $wb['password_mismatch_txt'] = 'Lösenorden matchar inte'; $wb['password_match_txt'] = 'Lösenorden matchar'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index b4224e99755b20491473831dbefd8b317b1a0ee1..a38c3e6d12f18148f3eb0148d345a03a6bcb30b1 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/se_server_php.lng +++ b/interface/web/admin/lib/lang/se_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng index e7a5e4b8bd5147743146d7ed0533ba15db4d1398..ac56cdf083565792415fdd170f839eddfc6e7743 100644 --- a/interface/web/admin/lib/lang/se_users.lng +++ b/interface/web/admin/lib/lang/se_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Lösenorden matchar'; $wb['username_error_collision'] = 'Användarnamnet får inte vara web eller web och ett nummer'; $wb['client_not_admin_err'] = 'En användare som tillhör en kund kan inte sättas som admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/sk_remote_user.lng b/interface/web/admin/lib/lang/sk_remote_user.lng index 028afed4f5b8a8ef27e6eb78f0412b2b56d6ebc1..200cd288613a6e1a0e6144ac11dccdf5d2685313 100644 --- a/interface/web/admin/lib/lang/sk_remote_user.lng +++ b/interface/web/admin/lib/lang/sk_remote_user.lng @@ -44,4 +44,7 @@ $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['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index e3f4d565a959bb4eef3c7e4c1836b359e678a7f0..f20c681e23a14d4f5fa4b7506a28f394a54bb53a 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -266,7 +266,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH'; $wb['backup_time_txt'] = 'Backup time'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng index addbfa49357aa4e45f3c0ef1700065df9cf541f7..179a8fc357142ea401cd663697ef817237957d10 100644 --- a/interface/web/admin/lib/lang/sk_server_php.lng +++ b/interface/web/admin/lib/lang/sk_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script'; $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory'; $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng index 9ba84d433e7576ac6c36bd4997bde874cb04763d..d71952fa3ed2dc9379579b758e330e93a2cc77df 100644 --- a/interface/web/admin/lib/lang/sk_users.lng +++ b/interface/web/admin/lib/lang/sk_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'The passwords do match.'; $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/lib/lang/tr_remote_user.lng b/interface/web/admin/lib/lang/tr_remote_user.lng index 998d34465358338869c8da74eb19971fc8961ef0..d9e11f8308aee177653e7c8580690d98d7f29762 100644 --- a/interface/web/admin/lib/lang/tr_remote_user.lng +++ b/interface/web/admin/lib/lang/tr_remote_user.lng @@ -44,4 +44,7 @@ $wb['generate_password_txt'] = 'Parola Oluştur'; $wb['repeat_password_txt'] = 'Parola Onayı'; $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.'; $wb['password_match_txt'] = 'Parola ile onayı aynı.'; +$wb['remote_access_txt'] = 'Remote Access'; +$wb['remote_ips_txt'] = 'Remote Access IPs / Hostnames (separate by , and leave blank for any)'; +$wb['remote_user_error_ips'] = 'At least one of the entered ip addresses or hostnames is invalid.'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index 542d02e5308ecb290fc1ed7c1c9717b7717aa61e..59a11a28cc352933abaea4e7fc79baef6821fce6 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -265,7 +265,7 @@ $wb['dkim_strength_txt'] = 'DKIM strength'; $wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes'; $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.'; $wb['php_ini_check_minutes_info_txt'] = '0 = no check'; -$wb['enable_spdy_txt'] = 'Makes SPDY available'; +$wb['enable_spdy_txt'] = 'Makes SPDY/HTTP2 available'; $wb['web_settings_txt'] = 'Web Server'; $wb['xmpp_server_txt'] = 'XMPP Server'; $wb['xmpp_use_ipv6_txt'] = 'Use IPv6'; @@ -283,4 +283,12 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN'; $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled'; $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check'; $wb['migration_mode_txt'] = 'Server Migration Mode'; +$wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; +$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; +$wb['logging_txt'] = 'Store website access and error logs'; +$wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; +$wb['log_retention_txt'] = 'Log retention (days)'; +$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng index a86d1959b25cb61ba38cb3e5fafeee342dfb73f4..8728444f130d19f507e5d0fec809a6be93117d30 100644 --- a/interface/web/admin/lib/lang/tr_server_php.lng +++ b/interface/web/admin/lib/lang/tr_server_php.lng @@ -13,4 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'php.ini Klasörünün Yolu'; $wb['php_fpm_init_script_txt'] = 'PHP-FPM Başlatma Betiğinin Yolu'; $wb['php_fpm_ini_dir_txt'] = 'php.ini Klasörünün Yolu'; $wb['php_fpm_pool_dir_txt'] = 'PHP-FPM Havuz Klasörünün Yolu'; +$wb['active_txt'] = 'Active'; ?> diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng index 5b1c1e848557b0fc89f5a204755147b568e26435..0029214773cda0aef35f2125ba5454dbe14845a5 100644 --- a/interface/web/admin/lib/lang/tr_users.lng +++ b/interface/web/admin/lib/lang/tr_users.lng @@ -32,4 +32,5 @@ $wb['password_match_txt'] = 'Parola ile onayı aynı.'; $wb['username_error_collision'] = 'Kullanıcı adı -web- ya da -web- sözcüğünü izleyen bir sayı ile başlayamaz.\\"'; $wb['client_not_admin_err'] = 'Bir müşteriye ait bir kullanıcının tipi admin olarak atanamaz'; $wb['lost_password_function_txt'] = 'Forgot password function is available'; +$wb['no_user_insert'] = 'CP-Users of type -user- get added and updated automatically when you add a client or reseller.'; ?> diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index df81f72846b0bc5962210fc984f4047ae2bb86a0..b69d7c9347afbfa33c9f72bd7c10beb90410e182 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -80,6 +80,10 @@
+ +
+
+
 {tmpl_var name='monit_url_note_txt'} [SERVERNAME]
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 4d5113efe828398ed9fdc4ea21a1554e78ac4a06..c1bae44c06f042850131ebe915062840ad7c7bad 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -60,6 +60,9 @@
+
+ +
{tmpl_var name='nginx_enable_pagespeed'}
@@ -101,6 +104,14 @@
{tmpl_var name='enable_ip_wildcard'}
+ +
+ +
+ {tmpl_var name='logging_desc_txt'} +
diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm index 067aa719a4bf12818b23a131b63e7c0204fa19e7..cfdaab63f9a220bd8bd210c615d67cf0624f0f4c 100644 --- a/interface/web/admin/templates/server_php_name_edit.htm +++ b/interface/web/admin/templates/server_php_name_edit.htm @@ -20,11 +20,13 @@
- +
+ +
{tmpl_var name='active'}
-
\ No newline at end of file +
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php index e3919649b934644a5eafcd2da22546314885d154..4c5c97409f1dd107fd69786d6dddfa6c05bec71f 100644 --- a/interface/web/admin/users_edit.php +++ b/interface/web/admin/users_edit.php @@ -62,7 +62,10 @@ class page_action extends tform_actions { $app->tform->errorMessage .= $app->tform->wordbook['startmodule_err']; } - + //* Do not add users here + if(isset($this->dataRecord['typ']) && $this->dataRecord['typ'][0] == 'user') { + $app->tform->errorMessage .= $app->tform->wordbook['no_user_insert']; + } } @@ -87,6 +90,11 @@ class page_action extends tform_actions { $app->tform->errorMessage .= $app->tform->wordbook['client_not_admin_err']; } + //* Users have to belong to clients + if(isset($this->dataRecord['typ']) && $this->dataRecord['typ'][0] == 'user' && $this->oldDataRecord['client_id'] == 0) { + $app->tform->errorMessage .= $app->tform->wordbook['no_user_insert']; + } + } /* diff --git a/interface/web/client/form/message_template.tform.php b/interface/web/client/form/message_template.tform.php index ab2d19134003e949254649bfbe8cb3b219be864e..7231e0e068ccc07982f30b4baac7673b241777dd 100644 --- a/interface/web/client/form/message_template.tform.php +++ b/interface/web/client/form/message_template.tform.php @@ -62,7 +62,7 @@ $form["tabs"]['template'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('welcome' => 'Default welcome email', 'other' => 'Other') + 'value' => array('welcome' => 'Default welcome email', 'gdpr' => 'GDPR data send', 'other' => 'Other') ), 'template_name' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/client/lib/lang/ar_client_message_template.lng b/interface/web/client/lib/lang/ar_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/ar_client_message_template.lng +++ b/interface/web/client/lib/lang/ar_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/ar_clients_list.lng b/interface/web/client/lib/lang/ar_clients_list.lng index f2c22fb8a5eb97e71ce3f16254a26a45ca8a4e3b..f568ad1a85ba37a64dcfbec615d198a81719370b 100644 --- a/interface/web/client/lib/lang/ar_clients_list.lng +++ b/interface/web/client/lib/lang/ar_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Country'; $wb['add_new_record_txt'] = 'Add new client'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/bg_client_message_template.lng b/interface/web/client/lib/lang/bg_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/bg_client_message_template.lng +++ b/interface/web/client/lib/lang/bg_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/bg_clients_list.lng b/interface/web/client/lib/lang/bg_clients_list.lng index b3ec44e0342334ebd3944edb3566b5390326dff2..a95e90ed7c1f569d8d4c6342f46acc7a686487bd 100644 --- a/interface/web/client/lib/lang/bg_clients_list.lng +++ b/interface/web/client/lib/lang/bg_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Държава'; $wb['add_new_record_txt'] = 'Добави нов клиент'; $wb['username_txt'] = 'Потребителско име'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index 43e49466e7a9f0f6abece50c6618db97af504cff..ad9282aa4cc24b04dad4473a7fa953e0739fe5b9 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -141,7 +141,7 @@ $wb['email_error_isemail'] = 'Por favor, insira um e-mail válido.'; $wb['customer_no_error_unique'] = 'O código do cliente deve ser exclusivo (ou em branco).'; $wb['paypal_email_error_isemail'] = 'Por favor, insira um e-mail do PayPal válido.'; $wb['paypal_email_txt'] = 'e-mail do PayPal'; -$wb['err_msg_master_tpl_set'] = 'Todos as configurações de limites personalizadas são ignoradas se qualquer gabarito mestre ou algum gabarito "personalizado" for selecionado.'; +$wb['err_msg_master_tpl_set'] = 'Todos as configurações de limites personalizadas são ignoradas se qualquer gabarito mestre ou algum gabarito \"personalizado\" for selecionado.'; $wb['aps_limits_txt'] = 'Limites de apps instalados'; $wb['limit_aps_txt'] = 'Limite de instâncias de apps'; $wb['limit_aps_error_notint'] = 'Limite de instâncias de apps deve ser um número.'; diff --git a/interface/web/client/lib/lang/br_client_message_template.lng b/interface/web/client/lib/lang/br_client_message_template.lng index 91c39bff5a291cba478233079cc04fdad1c0d43f..eb3c0b99382144c3017a9a9060973e30de8a82ab 100644 --- a/interface/web/client/lib/lang/br_client_message_template.lng +++ b/interface/web/client/lib/lang/br_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Configuração'; $wb['variables_txt'] = 'Variáveis'; $wb['variables_description_txt'] = '(As variáveis usuário e senha estão disponíveis apenas em e-mails de boas vindas.)'; $wb['duplicate_welcome_error'] = 'Disponível apenas para o gabarito padrão de e-mail de boas vindas. Por favor edite o gabarito existente ou adicione um novo gabarito.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index c3f2fb4d3eca5c7084798b6dda28d6166307ccd6..bc7124b16cfae24f37b7b307dbd05332368add8c 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -76,7 +76,7 @@ $wb['limit_perl_txt'] = 'Perl disponível'; $wb['limit_ruby_txt'] = 'Ruby disponível'; $wb['limit_python_txt'] = 'Python disponível'; $wb['force_suexec_txt'] = 'Forçar SuEXEC'; -$wb['limit_hterror_txt'] = 'Diretório "Custom error docs" disponível'; +$wb['limit_hterror_txt'] = 'Diretório \"Custom error docs\" disponível'; $wb['limit_wildcard_txt'] = 'Curingas de subdomínios disponíveis'; $wb['limit_ssl_txt'] = 'SSL disponível'; $wb['web_limits_txt'] = 'Limites web'; diff --git a/interface/web/client/lib/lang/br_clients_list.lng b/interface/web/client/lib/lang/br_clients_list.lng index 92c1c3cad7b8edd464a6e7fe38a938db2de2e899..7470bd27c4fc66bacc805adaa05e1626885ca35e 100644 --- a/interface/web/client/lib/lang/br_clients_list.lng +++ b/interface/web/client/lib/lang/br_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adicionar novo cliente'; $wb['username_txt'] = 'Usuário'; $wb['customer_no_txt'] = 'Código do Cliente'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/ca_client_message_template.lng b/interface/web/client/lib/lang/ca_client_message_template.lng index 2771206d99a1d174938eaadd2d0a595afef2c6c3..f51f3f9474fa9c1fe0d4a9892f4946255b010398 100644 --- a/interface/web/client/lib/lang/ca_client_message_template.lng +++ b/interface/web/client/lib/lang/ca_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome courriels.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome courriel template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/ca_clients_list.lng b/interface/web/client/lib/lang/ca_clients_list.lng index e3503f39c55687a841efbbceb9a589a2c950af63..5048b62131c8f51ec42916a8512253fdc083819e 100644 --- a/interface/web/client/lib/lang/ca_clients_list.lng +++ b/interface/web/client/lib/lang/ca_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Pays'; $wb['add_new_record_txt'] = 'Ajouter un nouveau client'; $wb['username_txt'] = 'Nom d\'utilisateur'; $wb['customer_no_txt'] = 'Numéro client'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/cz_client_message_template.lng b/interface/web/client/lib/lang/cz_client_message_template.lng index b5e0b73039446ff542410b8a59fbcec882b74638..b1d730c06718101e23581f616d4f5899b7f8bcc0 100644 --- a/interface/web/client/lib/lang/cz_client_message_template.lng +++ b/interface/web/client/lib/lang/cz_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Nastavení'; $wb['variables_txt'] = 'Proměnné'; $wb['variables_description_txt'] = 'Proměnné uživatelské jméno a heslo jsou k dispozici (funkční) jako volba pouze v uvítacím e-mailu.'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng index 3a28bf93e6fdb996260b4d5f651456d773e27fba..8cdabf2696da35a1b417623993040161aabb7419 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Stát'; $wb['add_new_record_txt'] = 'Vytvořit klienta'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['customer_no_txt'] = 'Zákaznické číslo'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng index a6bdd6a205d66f8b9c6a4909405f9b11ad593c80..7ab9eda75f8791e10dce4784f51141efcbfda415 100644 --- a/interface/web/client/lib/lang/de_clients_list.lng +++ b/interface/web/client/lib/lang/de_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Kunden hinzufügen'; $wb['username_txt'] = 'Benutzername'; $wb['customer_no_txt'] = 'Kundennummer'; +$wb['locked_txt'] = 'Gesperrt'; +$wb['yes_txt'] = 'Ja'; +$wb['no_txt'] = 'Nein'; ?> diff --git a/interface/web/client/lib/lang/dk_client_message_template.lng b/interface/web/client/lib/lang/dk_client_message_template.lng index d8f362875fbd49f476ae4217a8f4ebe84307126f..48ce083db41b683f98a041e40fdc568267a9974e 100644 --- a/interface/web/client/lib/lang/dk_client_message_template.lng +++ b/interface/web/client/lib/lang/dk_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Indstillinger'; $wb['variables_txt'] = 'Variabler'; $wb['variables_description_txt'] = '(Brugernavn og adgangskode variabler er kun tilgængelig i velkomst e-mails.)'; $wb['duplicate_welcome_error'] = 'Der kan kun være én standard velkomstmail skabelon. Rediger den eksisterende skabelon i stedet for at tilføje en ny.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/dk_clients_list.lng b/interface/web/client/lib/lang/dk_clients_list.lng index 69a1dbf1eb5fbfa9929bde82a9c1b8d0d25aeeff..ba0c540233dbd846f9b6245b5fc03715f8112b76 100644 --- a/interface/web/client/lib/lang/dk_clients_list.lng +++ b/interface/web/client/lib/lang/dk_clients_list.lng @@ -8,4 +8,7 @@ $wb['city_txt'] = 'By'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Tilføj ny kunde'; $wb['customer_no_txt'] = 'Kunde Nr.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/el_client_message_template.lng b/interface/web/client/lib/lang/el_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/el_client_message_template.lng +++ b/interface/web/client/lib/lang/el_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng index 56abc6218b0c0f6934fc706e854f4f848e36d4ee..1bbd3d31b3a72710bf07833f3720d76541355739 100644 --- a/interface/web/client/lib/lang/el_clients_list.lng +++ b/interface/web/client/lib/lang/el_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νέος Πελάτης'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/en_clients_list.lng b/interface/web/client/lib/lang/en_clients_list.lng index c9156d5c8c85361fef394e120bf02a30d186ab54..8d8bac7730864e0afbf2822ecf45090293ef5a2e 100644 --- a/interface/web/client/lib/lang/en_clients_list.lng +++ b/interface/web/client/lib/lang/en_clients_list.lng @@ -8,4 +8,7 @@ $wb["city_txt"] = 'City'; $wb["country_txt"] = 'Country'; $wb["add_new_record_txt"] = 'Add new client'; $wb["customer_no_txt"] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/es_client_message_template.lng b/interface/web/client/lib/lang/es_client_message_template.lng index 8c7de823ab3fc395ce49774a22abd353fc467bdc..208e9ebc823a3d1e41c4ff21f31d5bced12f85b4 100755 --- a/interface/web/client/lib/lang/es_client_message_template.lng +++ b/interface/web/client/lib/lang/es_client_message_template.lng @@ -8,4 +8,6 @@ $wb['template_name_txt'] = 'Nombre de la plantilla'; $wb['template_type_txt'] = 'Tipo de correo'; $wb['variables_description_txt'] = '(Las variables de nombre de usuario y contraseña están solo disponibles para correos de bienvenida.)'; $wb['variables_txt'] = 'Variables'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/es_clients_list.lng b/interface/web/client/lib/lang/es_clients_list.lng index 59b337a555cdb305acae00fb073d2a379d0c92bc..b213f405e6f2f0de162f8e7784133053cc2ba4de 100755 --- a/interface/web/client/lib/lang/es_clients_list.lng +++ b/interface/web/client/lib/lang/es_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'País'; $wb['customer_no_txt'] = 'Cliente Nº.'; $wb['list_head_txt'] = 'Clientes'; $wb['username_txt'] = 'Nombre de usuario'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/fi_client_message_template.lng b/interface/web/client/lib/lang/fi_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/fi_client_message_template.lng +++ b/interface/web/client/lib/lang/fi_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/fi_clients_list.lng b/interface/web/client/lib/lang/fi_clients_list.lng index 92999113bf4058a3a82f694946cb9caa99d0943d..8adc9e43194289bfc808053efd08cbc7b36c49a9 100755 --- a/interface/web/client/lib/lang/fi_clients_list.lng +++ b/interface/web/client/lib/lang/fi_clients_list.lng @@ -8,4 +8,7 @@ $wb['client_id_txt'] = 'Tunnus'; $wb['add_new_record_txt'] = 'Add new client'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/fr_client_message_template.lng b/interface/web/client/lib/lang/fr_client_message_template.lng index 8cbc0a52477b6fa1cbf0958671065b5b4196eb5a..63b3f6d0f308648b921b3e198185dd39a5e2afbd 100644 --- a/interface/web/client/lib/lang/fr_client_message_template.lng +++ b/interface/web/client/lib/lang/fr_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome e-mail template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng index 49601b57a1ade6f385621f04b2b3973b26c8a3ef..c467157d9bf46f3602b53246ffe10b132340ba67 100644 --- a/interface/web/client/lib/lang/fr_clients_list.lng +++ b/interface/web/client/lib/lang/fr_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Pays'; $wb['add_new_record_txt'] = 'Ajouter un nouveau client'; $wb['username_txt'] = 'Nom d’utilisateur'; $wb['customer_no_txt'] = 'Numéro client'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/hr_client_message_template.lng b/interface/web/client/lib/lang/hr_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/hr_client_message_template.lng +++ b/interface/web/client/lib/lang/hr_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/hr_clients_list.lng b/interface/web/client/lib/lang/hr_clients_list.lng index a7336922856fc82d2e660d0a261463e1f5f408dc..c1b8c1f2dedc55803490d931b5a619309015c753 100644 --- a/interface/web/client/lib/lang/hr_clients_list.lng +++ b/interface/web/client/lib/lang/hr_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Država'; $wb['add_new_record_txt'] = 'Dodaj klijenta'; $wb['username_txt'] = 'Korisničko ime'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/hu_client_message_template.lng b/interface/web/client/lib/lang/hu_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/hu_client_message_template.lng +++ b/interface/web/client/lib/lang/hu_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/hu_clients_list.lng b/interface/web/client/lib/lang/hu_clients_list.lng index c4a0762ef801cb5368d4841687cc01f4f7055571..f4d96a3192e1090de4660b04f1e01fb5c4b9e4bb 100644 --- a/interface/web/client/lib/lang/hu_clients_list.lng +++ b/interface/web/client/lib/lang/hu_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Ország'; $wb['add_new_record_txt'] = 'Új Ügyfél hozzáadása'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/id_client_message_template.lng b/interface/web/client/lib/lang/id_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/id_client_message_template.lng +++ b/interface/web/client/lib/lang/id_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/id_clients_list.lng b/interface/web/client/lib/lang/id_clients_list.lng index 380339fe8c7990f027fad8afdf72e0412b0bd419..a1d0c617b1053573a0d1392e88a5deca3c3214a0 100644 --- a/interface/web/client/lib/lang/id_clients_list.lng +++ b/interface/web/client/lib/lang/id_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Negara'; $wb['add_new_record_txt'] = 'Tambah Klien Baru'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/it_client_message_template.lng b/interface/web/client/lib/lang/it_client_message_template.lng index ea748be68503b68baacd081d0ff9718cbceaf3ae..f9c7d11c4d6a65c38b5e2016589d48d613e3fb5e 100644 --- a/interface/web/client/lib/lang/it_client_message_template.lng +++ b/interface/web/client/lib/lang/it_client_message_template.lng @@ -8,4 +8,6 @@ $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; $wb['template_name_txt'] = 'Template name'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/it_clients_list.lng b/interface/web/client/lib/lang/it_clients_list.lng index 14aacb1f0ffa8344b529150905ffb2a40af80f85..6b502eea884907a27dad577cc7bd744e1c1bb1ff 100644 --- a/interface/web/client/lib/lang/it_clients_list.lng +++ b/interface/web/client/lib/lang/it_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Stato'; $wb['add_new_record_txt'] = 'Aggiungi nuovo cliente'; $wb['username_txt'] = 'Nome Utente'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/ja_client_message_template.lng b/interface/web/client/lib/lang/ja_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/ja_client_message_template.lng +++ b/interface/web/client/lib/lang/ja_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/ja_clients_list.lng b/interface/web/client/lib/lang/ja_clients_list.lng index 9bb5bbdffc90d26d88e8a2b27359832d8283d383..1e67892f7d26ef265b35452429e4abf09631a54d 100644 --- a/interface/web/client/lib/lang/ja_clients_list.lng +++ b/interface/web/client/lib/lang/ja_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = '国'; $wb['add_new_record_txt'] = 'クライアントを追加する'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng index 4b962f12413be0c054575e5e162ac1793ae80695..466c3f0331ab8f63abefb94e053e4797f0d24f56 100644 --- a/interface/web/client/lib/lang/nl_clients_list.lng +++ b/interface/web/client/lib/lang/nl_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Toevoegen nieuwe klant'; $wb['username_txt'] = 'Gebruikersnaam'; $wb['customer_no_txt'] = 'Klantnummer'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/pl_client_message_template.lng b/interface/web/client/lib/lang/pl_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/pl_client_message_template.lng +++ b/interface/web/client/lib/lang/pl_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index c790271f5ac32397debbecf20a0542edeb2f2498..bacd8622006068c52ea00a478f77ac2ff11a7bc0 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Kraj'; $wb['add_new_record_txt'] = 'Dodaj nowego klienta'; $wb['username_txt'] = 'Login'; $wb['customer_no_txt'] = 'Nr klienta'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/pt_client_message_template.lng b/interface/web/client/lib/lang/pt_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/pt_client_message_template.lng +++ b/interface/web/client/lib/lang/pt_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/pt_clients_list.lng b/interface/web/client/lib/lang/pt_clients_list.lng index 4c5218bd5a305e60ce7485570f7f6427b71bc90b..ce10a50960bab70b14f6a89a640a48531f2656c9 100644 --- a/interface/web/client/lib/lang/pt_clients_list.lng +++ b/interface/web/client/lib/lang/pt_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'País'; $wb['add_new_record_txt'] = 'Adicionar Cliente'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/ro_client_message_template.lng b/interface/web/client/lib/lang/ro_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/ro_client_message_template.lng +++ b/interface/web/client/lib/lang/ro_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/ro_clients_list.lng b/interface/web/client/lib/lang/ro_clients_list.lng index d74ea1725f0637b0ef6653b16082716296a7967d..c4eb346dbf209158ed669e358d155e2a68a003f2 100644 --- a/interface/web/client/lib/lang/ro_clients_list.lng +++ b/interface/web/client/lib/lang/ro_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Tara'; $wb['add_new_record_txt'] = 'Adauga client nou'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index b9852ced60b0fa0735e571e014b75c2f9cf84dcb..a37d4673a1d69e4e0a6f2a4bc6da00fbb3a8e70d 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -1,5 +1,4 @@ username и password доступны только в приветственных письмах.)'; $wb['duplicate_welcome_error'] = 'Там может быть только один почтовый шаблон приветствия по умолчанию. Пожалуйста, измените существующий шаблон вместо добавления нового.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/ru_clients_list.lng b/interface/web/client/lib/lang/ru_clients_list.lng index 026adbd172b91dba18562b89a79d66b4ed6cbef0..4e50fec352f0f9dee1d5eefc2c815d4fb24b1e1a 100644 --- a/interface/web/client/lib/lang/ru_clients_list.lng +++ b/interface/web/client/lib/lang/ru_clients_list.lng @@ -8,4 +8,7 @@ $wb['client_id_txt'] = 'ID Клиента'; $wb['add_new_record_txt'] = 'Добавить клиента'; $wb['username_txt'] = 'Логин'; $wb['customer_no_txt'] = 'Номер Клиента'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 7b5e64ab91e3ad744995450eccd6356b43c09f84..4a177cccc8242ecc9f4249616d3e15e13bd1e8a8 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -1,6 +1,4 @@ diff --git a/interface/web/client/lib/lang/se_clients_list.lng b/interface/web/client/lib/lang/se_clients_list.lng index 263912f0d522d14549982ae50c2d963dbbc1c8ea..bcf3451e4473f902867eab463e0b31ffc98e2a26 100644 --- a/interface/web/client/lib/lang/se_clients_list.lng +++ b/interface/web/client/lib/lang/se_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Lägg till ny kund'; $wb['username_txt'] = 'Användarnamn'; $wb['customer_no_txt'] = 'Kundnummer'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/sk_client_message_template.lng b/interface/web/client/lib/lang/sk_client_message_template.lng index 65e5fbfba31c76eb65c5a40bd920dd33e08de032..acf2ae400ef37ad76cbf357c19265dd7ea939760 100644 --- a/interface/web/client/lib/lang/sk_client_message_template.lng +++ b/interface/web/client/lib/lang/sk_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting'; $wb['variables_txt'] = 'Variables'; $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)'; $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/sk_clients_list.lng b/interface/web/client/lib/lang/sk_clients_list.lng index 10eb6323af97993fb4aba93e73375bc6db6b291a..f1a81f4fdfe178fa8b0b74f3ca21186579eaabe5 100644 --- a/interface/web/client/lib/lang/sk_clients_list.lng +++ b/interface/web/client/lib/lang/sk_clients_list.lng @@ -8,4 +8,7 @@ $wb['country_txt'] = 'Krajina'; $wb['add_new_record_txt'] = 'Pridať nového klienta'; $wb['username_txt'] = 'Username'; $wb['customer_no_txt'] = 'Customer No.'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/lang/tr_client_message_template.lng b/interface/web/client/lib/lang/tr_client_message_template.lng index cafb3644459cc54325366832b747c2daa74bc187..885e2afc865693d21f588627dcc2639fed794fd7 100644 --- a/interface/web/client/lib/lang/tr_client_message_template.lng +++ b/interface/web/client/lib/lang/tr_client_message_template.lng @@ -8,4 +8,6 @@ $wb['Settings'] = 'Ayarlar'; $wb['variables_txt'] = 'Değişkenler'; $wb['variables_description_txt'] = '(Kullanıcı adı ve parola değişkenleri yalnız hoşgeldiniz e-postalarında kullanılabilir.)'; $wb['duplicate_welcome_error'] = 'Yalnız bir varsayılan hoşgeldiniz e-postası kalıbı bulunabilir. Lütfen yeni bir tema eklemek yerine varolan temayı düzenlemeyi deneyin.'; +$wb['subject_error_empty'] = 'Subject is empty'; +$wb['message_error_empty'] = 'Message is empty'; ?> diff --git a/interface/web/client/lib/lang/tr_clients_list.lng b/interface/web/client/lib/lang/tr_clients_list.lng index 6e19049d0aea01d671562d10512fda8b8e61d722..d59411a3d1d02dbcd35ddf9d61d71e1730ebb983 100644 --- a/interface/web/client/lib/lang/tr_clients_list.lng +++ b/interface/web/client/lib/lang/tr_clients_list.lng @@ -8,4 +8,7 @@ $wb['city_txt'] = 'İl'; $wb['country_txt'] = 'Ülke'; $wb['add_new_record_txt'] = 'Müşteri Ekle'; $wb['customer_no_txt'] = 'Müşteri No'; +$wb['locked_txt'] = 'Locked'; +$wb['yes_txt'] = 'Yes'; +$wb['no_txt'] = 'No'; ?> diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index 7d6f1b34e82c13d073b9bc209905e13789aa5a74..2603550c9b507b715dfe320bfd1553f73e98d124 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -94,6 +94,22 @@ if ($settings['use_domain_module'] == 'y') { unset($items); } +/* +// GDPR functions for admin only, might be extended for resellers later +if($_SESSION["s"]["user"]["typ"] == 'admin'){ + $items = array(); + $items[] = array( 'title' => 'Send Personal Data', + 'target' => 'content', + 'link' => 'client/gdpr_send.php'); + + $module['nav'][] = array( 'title' => 'GDPR', + 'open' => 1, + 'items' => $items); + + unset($items); +} +*/ + /* if($_SESSION["s"]["user"]["typ"] == 'admin'){ $items[] = array( 'title' => "Interface Settings", diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php index ae41bef408814f9fb4943a81ec7c315fe9309f38..393488ccdb75e1c66f421ed94c545730903e3eab 100644 --- a/interface/web/client/list/client.list.php +++ b/interface/web/client/list/client.list.php @@ -115,6 +115,15 @@ $liste["item"][] = array( 'field' => "country", 'width' => "", 'value' => ""); +$liste["item"][] = array( 'field' => "locked", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt'))); + if(is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){ $liste["item"][] = array( 'field' => "validation_status", 'datatype' => "VARCHAR", diff --git a/interface/web/client/list/domain.list.php b/interface/web/client/list/domain.list.php index c6f221c53cb618b016a730524d19445d72ad3ce1..8fc81eeef9f40e5175c0ca802cdf8e8b9958181c 100644 --- a/interface/web/client/list/domain.list.php +++ b/interface/web/client/list/domain.list.php @@ -93,7 +93,7 @@ $liste["item"][] = array( 'field' => "sys_groupid", 'suffix' => "", 'datasource' => array ( 'type' => 'SQL', //'querystring' => 'SELECT a.groupid, a.name FROM sys_group a, domain b WHERE (a.groupid = b.sys_groupid) AND ({AUTHSQL-B}) ORDER BY name', - 'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name", + 'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id AND {AUTHSQL} ORDER BY client.company_name, client.contact_name", 'keyfield'=> 'groupid', 'valuefield'=> 'name' ), diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 25d0dfcaf3554562d5b87103f7e75863b578237c..7a538eba22a212a38567418bae3d40970a862854 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -17,6 +17,7 @@ + @@ -28,6 +29,7 @@ + @@ -44,6 +46,7 @@ {tmpl_var name="client_id"} + {tmpl_var name="locked"} {tmpl_var name="company_name"} {tmpl_var name="contact_name"} {tmpl_var name="customer_no"} diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng index 3d4a48c5f7072c4f630637d2b2e83134d7d90e2e..dad751aaf08f94d1233419e933c66db400597314 100644 --- a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Брой на Клиенти'; $wb['limit_database_txt'] = 'Брой на Бази данни'; $wb['limit_mailmailinglist_txt'] = 'Брой на mailing листа'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng index 40d38fc7cad0f9e46bd64b77ba21386629d4b30c..04c59b883528a37f97fd2530a031b1aa70430a99 100644 --- a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Limite de clientes'; $wb['limit_database_txt'] = 'Limite de banco de dados'; $wb['limit_mailmailinglist_txt'] = 'Limite de listas de e-mails'; $wb['limit_domain_txt'] = 'Limite de domínios'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng index c9978ad17d279b3bbc19c794b49ffc458f271243..f482b47e38b0bab17dd6d0c0d2b4c169c8d9b904 100644 --- a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_webdav_user_txt'] = 'Nombre d\'utilisateurs WebDAV'; $wb['limit_client_txt'] = 'Nombre de clients'; $wb['limit_database_txt'] = 'Nombre de bases de données'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng index 0b75ac3c1c0ee0031e73dd55fcef2485ac1164cd..d322823e6bab0a400bd5e0d9ac06b6090bb98156 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Počet klientů'; $wb['limit_database_txt'] = 'Počet databází'; $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí'; $wb['limit_domain_txt'] = 'Počet domén'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng index 18d4b32453ddc1dc75fe9485758f1764af11eec8..335c17ca85afd24f86e155de0dfe5743cf8f3490 100644 --- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Anzahl der Kunden'; $wb['limit_database_txt'] = 'Anzahl der Datenbanken'; $wb['limit_mailmailinglist_txt'] = 'Anzahl der Mailinglisten'; $wb['limit_domain_txt'] = 'Anzahl der Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng index 546245cdfe8b9d729b7935d69e8ac46327854dcf..eb128750b2c84265319f5ccc71df3e8c318e16f5 100644 --- a/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/dk_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_webdav_user_txt'] = 'Antal af Webdav brugere'; $wb['limit_client_txt'] = 'Antal af Kunder'; $wb['limit_database_txt'] = 'Antal af Databaser'; $wb['limit_domain_txt'] = 'Antal af Domæner'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng index d7e687bfc426d515c7c06a7e8e5b9813f429069c..dac3b556232f3a3199b4220f66e3c787590c9e64 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Αριθμός Πελατών'; $wb['limit_database_txt'] = 'Αριθμός Databases'; $wb['limit_mailmailinglist_txt'] = 'Αριθμός λιστών ηλ. αλληλογραφίας'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng index 67b62f7df86fdb08f6f591b924dfc5b4c3596284..da6cd6b513fb9fa4f5f3ec258be6ac2ade7c95ab 100755 --- a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_webdav_user_txt'] = 'Cantidad de usuarios Webdav'; $wb['limits_txt'] = 'Límites de la cuenta'; $wb['of_txt'] = 'de'; $wb['unlimited_txt'] = 'Ilimitado'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng index c3d99fab9d9b5087554316f134bbaaa99a7f5206..525249f6d44ce91a5c54d43448f593096ce43e27 100644 --- a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_webdav_user_txt'] = 'Nombre d’utilisateurs WebDAV'; $wb['limit_client_txt'] = 'Nombre de clients'; $wb['limit_database_txt'] = 'Nombre de bases de données'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng index 3fc9765a75100a78b0f2fbed92a13671bf6bc7f4..1a3db42a24c7711caa7634567a94b92ccfb9a169 100644 --- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Klijenti'; $wb['limit_database_txt'] = 'Broj baza'; $wb['limit_mailmailinglist_txt'] = 'Broj mail lista'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng index 32694a682ac62adf1414276e6e320dbc1d249e98..13c5a4e45029a8c48a919ede5a071cfe2db3d8ab 100644 --- a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Ügyféls'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng index 73779bee8fc5b0f03a20061cbe2a1cfde8a93eab..8079b742b790194010abaaa99426d1f4c88a1492 100644 --- a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Jumlah Klien'; $wb['limit_database_txt'] = 'Jumlah Database'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng index 8546480f325143d956c2140539998dc20943bbfa..a1a2000edf88d00db8e8ee9b876265901bed1821 100644 --- a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Client'; $wb['limit_database_txt'] = 'Database'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng index feff0ac3384f2f52ade7bd2e0f924fd5b060af1c..4d5b971469952abfef8425650c7f7ae1e511ab11 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Liczba klientów'; $wb['limit_database_txt'] = 'Liczba baz danych'; $wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng index ca45eb57347dacbb4245a034f6b88f19f8077af1..19295b65e378928825bfe97a34d7338862d7f2c7 100644 --- a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Макс. количество клиентов'; $wb['limit_database_txt'] = 'Количество баз данных'; $wb['limit_mailmailinglist_txt'] = 'Количество почтовых рассылок'; $wb['limit_domain_txt'] = 'Количество доменов'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng index 84adfc3ae57356c19aafea586dc9d775925d0c2a..d1f38b1b0deb8bc41d5e9078f1022a16536e076c 100644 --- a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Antal kunder'; $wb['limit_database_txt'] = 'Antal databaser'; $wb['limit_mailmailinglist_txt'] = 'Antal mailinglistor'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng index 93986e51286a92a6bdab43f3cfa65b58d0989f05..6ec82aad5bd18a38c636383f0f415a0b172c5c96 100644 --- a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_client_txt'] = 'Number of Clients'; $wb['limit_database_txt'] = 'Number of Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; $wb['limit_domain_txt'] = 'Number of Domains'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng index 65985925cf6bed851881775047e3fcf2fb712ac8..a8869328f9f02096e41093acbcafca40cd1f04b0 100644 --- a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng @@ -28,4 +28,7 @@ $wb['limit_webdav_user_txt'] = 'Webdav Kullanıcı Sayısı'; $wb['limit_client_txt'] = 'Müşteri Sayısı'; $wb['limit_database_txt'] = 'Veritabanı Sayısı'; $wb['limit_domain_txt'] = 'Alan Adı Sayısı'; +$wb['limit_mailquota_txt'] = 'Assigned mailbox quota'; +$wb['limit_web_quota_txt'] = 'Assigned web quota'; +$wb['limit_database_quota_txt'] = 'Assigned database quota'; ?> diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php index 7f915074d75deccbf9f3f62cbb2e75a7b8ab6da2..6b720c0f38c9486b5f901ff7ab8a21630499a70f 100644 --- a/interface/web/dns/dns_dmarc_edit.php +++ b/interface/web/dns/dns_dmarc_edit.php @@ -287,7 +287,7 @@ class page_action extends tform_actions { unset($temp); } - $fo_rec = ''; + $fo_rec = array(); if (isset($this->dataRecord['dmarc_fo0'])) $fo_rec[] = '0'; if (isset($this->dataRecord['dmarc_fo1'])) $fo_rec[] = '1'; if (isset($this->dataRecord['dmarc_fod'])) $fo_rec[] = 'd'; diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php index 405e437838a4895687790f11fbe5dcd971477560..49c14185d016fca3462697b918983c8ebb0fe3d4 100644 --- a/interface/web/dns/dns_import.php +++ b/interface/web/dns/dns_import.php @@ -606,6 +606,7 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['type'] = 'NS'; $dns_rr[$r]['data'] = $server['server_name']; $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['ttl'] = $soa['ttl']; $r++; } //print('
');
diff --git a/interface/web/dns/form/dns_ns.tform.php b/interface/web/dns/form/dns_ns.tform.php
index 063a896de3719f8c9bd6da4543383dcfa5720f88..e20a7892bfce61b2ed904f7fcfe782c9ca7c41f9 100644
--- a/interface/web/dns/form/dns_ns.tform.php
+++ b/interface/web/dns/form/dns_ns.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
+					'regex' => '/^[_a-zA-Z0-9\.\-]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 910b2e6bb304f04ef16ca678f8ae3838ed857ea3..6fab657baac1f601aab737bcd446d7c0e6e43329 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -319,6 +319,7 @@ $form["tabs"]['dns_records'] = array (
 	)
 );
 
-
+// show update acl to admins only.
+if(!$app->auth->is_admin()) unset($form["tabs"]['dns_soa']['fields']['update_acl']);
 
 ?>
diff --git a/interface/web/dns/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng
index 633a0f8a3a032b56331bb8bf4b89dbaf3baa07dc..b45d1575af67fd22a874e0fb3074a343485c90c4 100644
--- a/interface/web/dns/lib/lang/br.lng
+++ b/interface/web/dns/lib/lang/br.lng
@@ -18,6 +18,5 @@ $wb['DNS Wizard'] = 'Assistente dns';
 $wb['Add DNS Zone'] = 'Adicionar nova zona';
 $wb['Import Zone File'] = 'Importar arquivo de zona';
 $wb['Templates'] = 'Gabaritos';
-$wb['Secondary DNS'] = 'DNS Secundário';
 $wb['Secondary Zones'] = 'Zonas secundárias';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_dkim.lng b/interface/web/dns/lib/lang/br_dns_dkim.lng
index 9f4a805720b69a065a8678a1e73757a105b3b0a8..1ec851a216b80324f451df216e096d157d032fa3 100644
--- a/interface/web/dns/lib/lang/br_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/br_dns_dkim.lng
@@ -8,4 +8,6 @@ $wb['limit_dns_record_txt'] = 'O limite de registros dns para esta conta foi alc
 $wb['no_zone_perm'] = 'Você não tem permissão para adicionar registros a esta zona dns.';
 $wb['ttl_range_error'] = 'O ttl mínimo são 60 segundos.';
 $wb['selector_txt'] = 'Seletor DKIM';
+$wb['data_error_empty'] = 'Public-Key missing';
+$wb['dkim_selector_empty_txt'] = 'DKIM-Selector is empty';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_dmarc.lng b/interface/web/dns/lib/lang/br_dns_dmarc.lng
index 3928dc6ead8b0b4ce82fdfbf7df8cfaa0f571588..5b7201075fbd364533109bf712812525ea1142c5 100644
--- a/interface/web/dns/lib/lang/br_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/br_dns_dmarc.lng
@@ -2,7 +2,7 @@
 $wb['data_txt'] = 'Registro DMARC';
 $wb['domain_txt'] = 'Domínio';
 $wb['dmarc_policy_txt'] = 'Política de recepção de e-mails';
-$wb['dmarc_policy_note_txt'] = 'Como os "ISPs" devem tratar as mensagens SPF ou DKIM com falha (DMARC).';
+$wb['dmarc_policy_note_txt'] = 'Como os \"ISPs\" devem tratar as mensagens SPF ou DKIM com falha (DMARC).';
 $wb['dmarc_policy_none_txt'] = 'não fazer nada';
 $wb['dmarc_policy_quarantine_txt'] = 'quarentena';
 $wb['dmarc_policy_reject_txt'] = 'rejeitar';
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Endereços de e-mail para receber relatórios do si
 $wb['dmarc_ruf_txt'] = 'Relatório forense de dados por endereço';
 $wb['dmarc_ruf_note_txt'] = 'Endereços de e-mail para receber amostras de mensagens com falha e controles DMARC do domínio (separados por espaço em branco)';
 $wb['dmarc_fo_txt'] = 'Opções de relatório forense';
-$wb['dmarc_fo0_txt'] = 'Gerar relatórios se todos os mecanismos de autenticação subjacentes deixarem de produzir um resultado DMARC "pass".';
+$wb['dmarc_fo0_txt'] = 'Gerar relatórios se todos os mecanismos de autenticação subjacentes deixarem de produzir um resultado DMARC \"pass\".';
 $wb['dmarc_fo1_txt'] = 'Gerar relatório se algum mecanismo falhar.';
 $wb['dmarc_fod_txt'] = 'Gerar relatório se assinatura DKIM falhar na verificação.';
 $wb['dmarc_fos_txt'] = 'Gerar relatório se o SPF falhar.';
 $wb['dmarc_adkim_txt'] = 'Parametrização do identificador DKIM';
-$wb['dmarc_adkim_note_txt'] = 'Modo "strict" exige combinação exata entre o DKIM do domínio e e-mails';
+$wb['dmarc_adkim_note_txt'] = 'Modo \"strict\" exige combinação exata entre o DKIM do domínio e e-mails';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'Parametrização do identificador SPF';
-$wb['dmarc_aspf_note_txt'] = 'Modo "strict" exige combinação exata entre o SPF do domínio e e-mails';
+$wb['dmarc_aspf_note_txt'] = 'Modo \"strict\" exige combinação exata entre o SPF do domínio e e-mails';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Formatação do relatório';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarentena';
 $wb['dmarc_sp_reject_txt'] = 'rejeitar';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Ativo';
-$wb['dmarc_policy_error_txt'] = 'Somente a política "nenhum" é permitida para e-mails sem assinatura DKIM.';
+$wb['dmarc_policy_error_txt'] = 'Somente a política \"nenhum\" é permitida para e-mails sem assinatura DKIM.';
 $wb['dmarc_no_dkim_txt'] = 'Nenhum registro DKIM ativo.';
 $wb['dmarc_no_spf_txt'] = 'Nenhum registro SPF ativo.';
 $wb['dmarc_more_spf_txt'] = 'Mais de um registro SPF ativo.';
diff --git a/interface/web/dns/lib/lang/br_dns_spf.lng b/interface/web/dns/lib/lang/br_dns_spf.lng
index 61099b0c5d92faec1313a135e253e07c1ec1cc29..0c56cd32ed8a03e7472d75895bbc0007a31500de 100644
--- a/interface/web/dns/lib/lang/br_dns_spf.lng
+++ b/interface/web/dns/lib/lang/br_dns_spf.lng
@@ -23,4 +23,3 @@ $wb['limit_dns_record_txt'] = 'O limite de registros dns para esta conta foi alc
 $wb['no_zone_perm'] = 'Você não tem permissão para adicionar registros a esta zona dns.';
 $wb['ttl_range_error'] = 'O ttl mínimo são 60 segundos.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/br_dns_tlsa.lng b/interface/web/dns/lib/lang/br_dns_tlsa.lng
index e20ba1cd6cf5651dead6f65b599956071488e9f4..c78c6fd1904e9192bebecc0ccfa8e326698d71b7 100644
--- a/interface/web/dns/lib/lang/br_dns_tlsa.lng
+++ b/interface/web/dns/lib/lang/br_dns_tlsa.lng
@@ -9,8 +9,8 @@ $wb['active_txt'] = 'Ativo';
 $wb['limit_dns_record_txt'] = 'O limite de registros dns para esta conta foi alcançado.';
 $wb['no_zone_perm'] = 'Você não tem permissão para adicionar registros a esta zona dns.';
 $wb['name_error_empty'] = 'Descritor de serviço está em branco.';
-$wb['name_error_regex'] = 'Descritor de serviço é inválido. Formato correto: "_<port>._(tcp|udp).<hostname>".';
+$wb['name_error_regex'] = 'Descritor de serviço é inválido. Formato correto: \"_<port>._(tcp|udp).<hostname>\".';
 $wb['data_error_empty'] = 'Dados TLSA está em branco.';
-$wb['data_error_regex'] = 'Dados TLSA são inválidos. Formato correto: "n n n HASH".';
+$wb['data_error_regex'] = 'Dados TLSA são inválidos. Formato correto: \"n n n HASH\".';
 $wb['ttl_range_error'] = 'O ttl mínimo são 60 segundos.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru.lng b/interface/web/dns/lib/lang/ru.lng
index 9afdd9e0eb8d09856c9a10bea3a4dc88b1264d1e..5faccbf414536bcb81a8d839b3c93e2aec95100a 100644
--- a/interface/web/dns/lib/lang/ru.lng
+++ b/interface/web/dns/lib/lang/ru.lng
@@ -19,5 +19,4 @@ $wb['Add DNS Zone'] = 'Добавить DNS-зону';
 $wb['Templates'] = 'Шаблоны';
 $wb['Secondary Zones'] = 'Вторичные зоны';
 $wb['Import Zone File'] = 'Импорт файла зоны';
-$wb['Secondary DNS'] = 'Вторичные DNS';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_hinfo.lng b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
index 82501ab3c0b04953fa4802ffea654ec566344b14..830576fdf6843fe77fc75b601936323849603c79 100644
--- a/interface/web/dns/lib/lang/ru_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'У Вас нет прав добавлять эту за
 $wb['name_error_empty'] = 'Имя пустое.';
 $wb['name_error_regex'] = 'Имя узла имеет неправильный формат.';
 $wb['data_error_empty'] = 'Информация об узле отсутсвует';
-$wb['data_error_regex'] = 'Поле "Информация о хосте" имеет неправильный формат';
+$wb['data_error_regex'] = 'Поле \"Информация о хосте\" имеет неправильный формат';
 $wb['ttl_range_error'] = 'Мин. время TTL 60 секунд.';
 ?>
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 87853d1edefd222aa3f745a931ec378355e237a0..94faec4fa1be9ae01a36e9dd4996f79cbf6b3224 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -120,10 +120,11 @@
             

                 
                 

-            

+            
+			

                 
                 

-                
+            
             

                 
                 

diff --git a/interface/web/help/lib/lang/br_support_message.lng b/interface/web/help/lib/lang/br_support_message.lng
index 7071091721c1dd55f7a90be3bb5bacef53e00593..83097915bf345a5cd62ab30fd8debbcc24151e16 100644
--- a/interface/web/help/lib/lang/br_support_message.lng
+++ b/interface/web/help/lib/lang/br_support_message.lng
@@ -12,5 +12,5 @@ $wb['answer_to_support_request_txt'] = 'Você tem uma nova resposta para requisi
 $wb['answer_to_support_request_sent_txt'] = 'Sua resposta para requisição de suporte foi enviada. Por favor, não responda esse e-mail.';
 $wb['support_request_sent_txt'] = 'Sua requisição de suporte foi enviada. Por favor não responda este e-mail.';
 $wb['recipient_or_sender_email_address_not_valid_txt'] = 'A mensagem não foi enviada porque o e-mail do destinatário e/ou remetente não é válido.';
-$wb['subject_is_empty'] = 'Não é permitido o campo "Assunto" em branco.';
+$wb['subject_is_empty'] = 'Não é permitido o campo \"Assunto\" em branco.';
 ?>
diff --git a/interface/web/login/lib/lang/br_login_as.lng b/interface/web/login/lib/lang/br_login_as.lng
index 8fc0d1c1c3ce0ebe0e51cb64aeb0adf6f09ff16b..e57ba4e188f6ed0f867d4ab11e6c8f493ef95b5a 100644
--- a/interface/web/login/lib/lang/br_login_as.lng
+++ b/interface/web/login/lib/lang/br_login_as.lng
@@ -1,6 +1,6 @@
 
\ No newline at end of file
diff --git a/interface/web/mail/form/spamfilter_users.tform.php b/interface/web/mail/form/spamfilter_users.tform.php
index 1ed9e54b0d86c66d34c71dcc9fc5acea9122daf8..8ef3c4e131872ca1bba7cc0458ca133d71d4e870 100644
--- a/interface/web/mail/form/spamfilter_users.tform.php
+++ b/interface/web/mail/form/spamfilter_users.tform.php
@@ -94,8 +94,12 @@ $form["tabs"]['users'] = array (
 					'type' => 'TOLOWER'),
 					1 => array( 'event' => 'SAVE',
 					'type' => 'STRIPTAGS'),
-				2 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
+					2 => array( 'event' => 'SAVE',
+					'type' => 'STRIPNL'),
+					3 => array( 'event' => 'SAVE',
+					'type' => 'IDNTOASCII'),
+					4 => array( 'event' => 'SHOW',
+					'type' => 'IDNTOUTF8')
 			),
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'email_error_notempty'),
diff --git a/interface/web/mail/lib/lang/br.lng b/interface/web/mail/lib/lang/br.lng
index dbd930fe584d1262eba15fcab057a2bae0d981fd..3ae45b5db0c1c101eb97653392d025b27fa2d361 100644
--- a/interface/web/mail/lib/lang/br.lng
+++ b/interface/web/mail/lib/lang/br.lng
@@ -12,8 +12,6 @@ $wb['Get Email'] = 'Busca de e-mail';
 $wb['Spamfilter'] = 'Filtro anti-spam';
 $wb['Email Routing'] = 'Transportes';
 $wb['Email transport'] = 'Transportes';
-$wb['Mailing List'] = 'Lista de e-mails';
-$wb['Mailing List'] = 'Lista de e-mails';
 $wb['Mailbox'] = 'Contas de e-mail';
 $wb['Autoresponder'] = 'Resposta automática';
 $wb['Mail Filter'] = 'Filtros';
@@ -37,9 +35,6 @@ $wb['Email Accounts'] = 'Contas de e-mail';
 $wb['User / Domain'] = 'Usuário/domínio';
 $wb['Server Settings'] = 'Configurações do servidor';
 $wb['Fetchmail'] = 'Contas de busca';
-$wb['XMPP Domain'] = 'Domínios xmpp';
-$wb['XMPP Account'] = 'Contas xmpp';
-$wb['Backup Stats'] = 'Estatísticas de backup';
 $wb['Mailbox traffic'] = 'Tráfego';
 $wb['Statistics'] = 'Estatísticas';
 $wb['Postfix Whitelist'] = 'Postfix (lista branca)';
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 4407e22adc21fbcf169aafd32ba3249521abf4e7..a786566277f1b6ef13de16713847e8b2e27c839c 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -35,7 +35,7 @@ $wb['name_txt'] = 'Nome real';
 $wb['name_optional_txt'] = '(Opcional)';
 $wb['autoresponder_active'] = 'Ativar autoresposta';
 $wb['cc_txt'] = 'Enviar cópia para';
-$wb['cc_error_isemail'] = 'O campo "Enviar cópia para" deve conter um endereço de e-mail válido';
+$wb['cc_error_isemail'] = 'O campo \"Enviar cópia para\" deve conter um endereço de e-mail válido';
 $wb['domain_txt'] = 'Domínio';
 $wb['now_txt'] = 'Agora';
 $wb['login_error_unique'] = 'O acesso já está em uso.';
@@ -48,7 +48,7 @@ $wb['generate_password_txt'] = 'Gerar senha';
 $wb['repeat_password_txt'] = 'Repetir senha';
 $wb['password_mismatch_txt'] = 'A senhas não coincidem.';
 $wb['password_match_txt'] = 'A senhas coincidem.';
-$wb['email_error_isascii'] = 'Por favor não use caracteres "unicode" para a senha. Esta ação poderá causar problemas com seu cliente de e-mail (mua).';
+$wb['email_error_isascii'] = 'Por favor não use caracteres \"unicode\" para a senha. Esta ação poderá causar problemas com seu cliente de e-mail (mua).';
 $wb['cc_note_txt'] = '(Múltiplos e-mails separados por vírgulas)';
 $wb['disablesmtp_txt'] = 'Desabilitar smtp (envio)';
 $wb['autoresponder_start_date_is_required'] = 'Data de início deve ser configurada quando \'autoresposta\' é habilitada.';
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index fa8ac6defaeb6aa04993b2661ed1cf11bafabc88..93c2095e1c75f5bc208a7288ef46ba35b973896b 100755
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -58,7 +58,7 @@ $wb['quota_txt'] = 'Cuota (0 para ilimitada)';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['sender_cc_error_isemail'] = 'El campo -Enviar copia a- no contiene una dirección de correo válida';
 $wb['sender_cc_note_txt'] = '(Separe múltiples cuentas de correo con comas)';
-$wb['sender_cc_txt'] = 'Enviar copia a';
+$wb['sender_cc_txt'] = 'Enviar copia saliente a';
 $wb['server_id_txt'] = 'id_del_servidor';
 $wb['weekly_backup_txt'] = 'Semanalmente';
 $wb['password_click_to_set_txt'] = 'Click to set';
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index 541d019d14a1a3f336ce8683b32b7b748de6978f..0ce613cd0538cd1f020b538c1b1a111c5e7edc51 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -14,6 +14,6 @@ $wb['source_password_error_isempty'] = 'Пустой пароль.';
 $wb['destination_error_isemail'] = 'Не выбран получатель или запись некорректна.';
 $wb['source_server_error_regex'] = 'Некорректное доменное имя для сервера POP3/IMAP.';
 $wb['source_read_all_txt'] = 'Получать все сообщения электронной почты (включая прочитанные письма)';
-$wb['error_delete_read_all_combination'] = 'Недопустимая комбинация параметров. Вы не можете использовать "Удалить письма после получения" = НЕТ вместе с "Получить все письма" = ДА';
+$wb['error_delete_read_all_combination'] = 'Недопустимая комбинация параметров. Вы не можете использовать \"Удалить письма после получения\" = НЕТ вместе с \"Получить все письма\" = ДА';
 $wb['source_delete_note_txt'] = 'Пожалуйста, прежде чем активировать этот параметр, убедитесь в том, что сборщик почты работает.';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter.lng b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
index 94193b5bd6c71bc367ce3e767dcba403b087bbe4..ecc2d25b9de7fad9ee7bc584aea3c7ec8013c1f4 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Активно';
 $wb['rulename_error_empty'] = 'Имя пустое.';
 $wb['searchterm_is_empty'] = 'Поле поиска пустое.';
 $wb['source_txt'] = 'Источник';
-$wb['target_error_regex'] = 'Назначение может содержать только следующие символы: "a-z", "0-9", "-", ".", "_" и {пробел}';
+$wb['target_error_regex'] = 'Назначение может содержать только следующие символы: \"a-z\", \"0-9\", \"-\", \".\", \"_\" и {пробел}';
 $wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров достигнуто.';
 $wb['subject_txt'] = 'Тема';
 $wb['from_txt'] = 'От';
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
index eb7ff4b4d639f34b887ea6f96bfdd5c1b414d2aa..8f5b27dd2a6954d3ba67c66c47d642995f404e62 100644
--- a/interface/web/mail/mail_alias_edit.php
+++ b/interface/web/mail/mail_alias_edit.php
@@ -76,7 +76,7 @@ class page_action extends tform_actions {
 
 		// Getting Domains of the user
 		// $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
-		$sql = "SELECT domain FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain";
+		$sql = "SELECT domain FROM mail_domain WHERE (".$app->tform->getAuthSQL('r').") AND domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain')  ORDER BY domain";     
 		$domains = $app->db->queryAllRecords($sql);
 		$domain_select = '';
 		if(is_array($domains)) {
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index ee8c5f29971b38bbe2cf27e674496eca68a1bb9a..e783ad98a9e390363a8b32c34660027ff4c7203b 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -76,7 +76,7 @@ class page_action extends tform_actions {
 
 		// Getting Domains of the user
 		//$sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
-		$sql = "SELECT domain FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain";
+		$sql = "SELECT domain FROM mail_domain WHERE (".$app->tform->getAuthSQL('r').") AND domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') ORDER BY domain";
 		$domains = $app->db->queryAllRecords($sql);
 		$domain_select = '';
 		foreach( $domains as $domain) {
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 6cf9b34e3649b6b352d7b05fa65fcb5ceda0a58e..910d7a096a5f1acb49c3e231d1966895a2eeac45 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -77,7 +77,7 @@ class page_action extends tform_actions {
 
 		// Getting Domains of the user
 		// $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
-		$sql = "SELECT domain, server_id FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain";
+		$sql = "SELECT domain, server_id FROM mail_domain WHERE (".$app->tform->getAuthSQL('r').") AND domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') ORDER BY domain";               
 		$domains = $app->db->queryAllRecords($sql);
 		$domain_select = '';
 		if(is_array($domains)) {
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
index 099fd2f0005d3af0e5ec0a5460dcb001e6c28116..f10dd4ddb24e7abead46488aa725e142b5f93dba 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_filter.lng
@@ -6,7 +6,7 @@ $wb['active_txt'] = 'Активно';
 $wb['rulename_error_empty'] = 'Имя пустое.';
 $wb['searchterm_is_empty'] = 'Поле поиска пустое.';
 $wb['source_txt'] = 'Источник';
-$wb['target_error_regex'] = 'Назначение может содержать только следующие символы: "a-z", "0-9", "-", ".", "_" и {пробел}';
+$wb['target_error_regex'] = 'Назначение может содержать только следующие символы: \"a-z\", \"0-9\", \"-\", \".\", \"_\" и {пробел}';
 $wb['limit_mailfilter_txt'] = 'Максимальное число почтовых фильтров достигнуто.';
 $wb['subject_txt'] = 'Тема';
 $wb['from_txt'] = 'От';
diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng
index 7dad489c1bd85cf42da92ffac717318d3e38d25a..e2a490e466908c8e0799741b59b2d984310a58d5 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -32,7 +32,6 @@ $wb['Show Update State'] = 'Exibir estado atual';
 $wb['Show RAID state'] = 'Exibir estado do RAID';
 $wb['Show Server load'] = 'Exibir carga do servidor';
 $wb['Show Disk usage'] = 'Exibir uso do disco';
-$wb['Show MySQL Database size'] = 'Exibir tamanho do banco de dados MySQL';
 $wb['Show Memory usage'] = 'Exibir uso da memória';
 $wb['Show Services'] = 'Exibir serviços';
 $wb['Show Mail-Queue'] = 'Exibir fila de e-mails';
diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng
index dbac69a86f00d80d0f4fd790c8c8fd42646aa308..cbabab99ed0a537085fe35854d259d47a4c320f5 100644
--- a/interface/web/monitor/lib/lang/ru.lng
+++ b/interface/web/monitor/lib/lang/ru.lng
@@ -7,7 +7,6 @@ $wb['System load 15 minutes'] = 'Загрузка системы за 15 мин
 $wb['Server Load'] = 'Загрузка сервера';
 $wb['Disk usage'] = 'Использование диска';
 $wb['Memory usage'] = 'Использование памяти';
-$wb['Database size'] = 'Размер базы данных';
 $wb['no_data_serverload_txt'] = ' Нет данных по загрузке сервера в данный момент. Пожалуйста, проверьте позже.';
 $wb['no_data_memusage_txt'] = 'Нет данных по загрузке памяти в данный момент. Пожалуйста, проверьте позже.';
 $wb['no_data_diskusage_txt'] = 'Нет данных по загрузке HDD в данный момент. Пожалуйста, проверьте позже.';
@@ -29,7 +28,6 @@ $wb['Show Update State'] = 'Показать состояние обновлен
 $wb['Show RAID state'] = 'Показать состояние RAID';
 $wb['Show Server load'] = 'Показать загрузку сервера';
 $wb['Show Disk usage'] = 'Показать использование диска';
-$wb['Show MySQL Database size'] = 'Показать размер базы данных MySQL';
 $wb['Show Memory usage'] = 'Показать использование памяти';
 $wb['Show Services'] = 'Показать службы';
 $wb['Show Mail-Queue'] = 'Показать очередь почты';
@@ -163,8 +161,3 @@ $wb['Show MongoDB-Log'] = 'Показать журнал MongoDB';
 $wb['monitor_services_mongodb_txt'] = 'MongoDB-сервер:';
 $wb['monitor_title_mongodb_txt'] = 'Журнал MongoDB';
 ?>
-
-
-
-
-
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index f882f44c3a6fd2669207d7692b5e8097989548d2..fc41444e3f64eb78fd97180e8b88076d15d61c64 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -93,9 +93,9 @@ if($type == 'getphpfastcgi'){
 	}
 
 	if($php_type == 'php-fpm' || ($php_type == 'hhvm' && $server_type == 'nginx')){
-		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where." ORDER BY name", $server_id);
+		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND active = 'y' ORDER BY name".$sql_where, $server_id);
 	} elseif($php_type == 'fast-cgi'){
-		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ?".$sql_where." ORDER BY name", $server_id);
+		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y' ORDER BY name".$sql_where, $server_id);
 	}
 	$php_select = "";
 	if(is_array($php_records) && !empty($php_records)) {
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
index f230226ef8fcf8a5fc0fc602870237b5e203be6f..aedf76749992febaacc6fc6bb9bb6012bf7f6b9b 100644
--- a/interface/web/sites/form/web_vhost_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -953,18 +953,18 @@ if($_SESSION["s"]["user"]["typ"] == 'admin'
 				'width'  => '3',
 				'maxlength' => '6'
 			),
-                        'log_retention' => array (
-                                'datatype' => 'INTEGER',
-                                'formtype' => 'TEXT',
-                                'validators' => array (  0 => array ( 'type' => 'REGEX',
-                                                'regex' => '/^([0-9]{1,4})$/',
-                                                'errmsg'=> 'log_retention_error_regex'),
-                                ),
-                                'default' => '30',
-                                'value' => '',
-                                'width' => '4',
-                                'maxlength' => '4'
-                        )
+			'log_retention' => array (
+				'datatype' => 'INTEGER',
+				'formtype' => 'TEXT',
+				'validators' => array (  0 => array ( 'type' => 'REGEX',
+					'regex' => '/^([0-9]{1,4})$/',
+					'errmsg'=> 'log_retention_error_regex'),
+				),
+				'default' => '30',
+				'value' => '',
+				'width' => '4',
+				'maxlength' => '4'
+			)
 			//#################################
 			// ENDE Datatable fields
 			//#################################
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
index 0cbee5b1219730bdf3a356c0ab59758b3d9598cf..8ea34c440978e1ec0920627b26e72315d713eda1 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
@@ -8,7 +8,6 @@ $wb['add_new_record_txt'] = 'Add new aliasdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
diff --git a/interface/web/sites/lib/lang/ar_web_childdomain.lng b/interface/web/sites/lib/lang/ar_web_childdomain.lng
index e948694b3b5941d7380065c2947d4f9af34a92b4..636505f2487e4367810b7e453616ff82d29c30f1 100644
--- a/interface/web/sites/lib/lang/ar_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
index 00edc9ce51db5f2ae772a8ca39ce54ceb4c34092..1ab9c55d3d9f88099cdfb79a0166d46d39189308 100644
--- a/interface/web/sites/lib/lang/ar_web_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -38,7 +38,6 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng
index b4a8c15f1563df72b828881a9ba79883d9f3e89f..c5fa1711bbbecf45e91322c7c5192b51a25d24b2 100644
--- a/interface/web/sites/lib/lang/ar_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng
@@ -35,7 +35,6 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
 $wb['no_redirect_txt'] = 'No redirect';
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
index 628f0d6293409d11988ccae2119d91d80f8a56fb..c2896d02df0f9cf614127a026cdeb074e82a9eeb 100644
--- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
@@ -137,7 +137,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/bg_web_childdomain.lng b/interface/web/sites/lib/lang/bg_web_childdomain.lng
index 0d185de23869603dafd1a5ddd4711beb693ac072..c7549b76f7ef95a2ce18cae7301a826f375c4029 100644
--- a/interface/web/sites/lib/lang/bg_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_childdomain_list.lng b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
index 26d6c4881085b34e219a7444d5377a872f7dfd35..d974c9630f0a73bc578f70ab4615ed948faccaf3 100644
--- a/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
index 971ca5d893c646b4ffb2b6d0eb2f4ece4e02fcc1..83828a743d1ed5816b7b7d2d17cd9f67a8bf8632 100644
--- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/br.lng b/interface/web/sites/lib/lang/br.lng
index 6957f0b801b38a7193e5d0bc446327d0dcdb5547..3fdd93585ec8e05b83eb8750964d30e38e2c46d6 100644
--- a/interface/web/sites/lib/lang/br.lng
+++ b/interface/web/sites/lib/lang/br.lng
@@ -14,10 +14,7 @@ $wb['Shell-User'] = 'Usuários shell';
 $wb['Cron Jobs'] = 'Tarefas no cron';
 $wb['Statistics'] = 'Estatísticas';
 $wb['Web traffic'] = 'Tráfego web';
-$wb['FTP traffic'] = 'Tráfego ftp';
 $wb['Website quota (Harddisk)'] = 'Cota para sites (disco)';
-$wb['Database quota'] = 'Cota para banco de dados';
-$wb['Backup Stats'] = 'Estatísticas de backup';
 $wb['Cron'] = 'Cron';
 $wb['Stats'] = 'Estatísticas';
 $wb['Shell'] = 'Shell';
@@ -33,6 +30,6 @@ $wb['Available packages'] = 'Pacotes disponíveis';
 $wb['Installed packages'] = 'Pacotes instalados';
 $wb['Update Packagelist'] = 'Atualizar lista de pacotes';
 $wb['Subdomain (Vhost)'] = 'Subdomínio (vhost)';
-$wb['error_proxy_requires_url'] = 'Tipo de redirecionamento "proxy" exige uma url como caminho do redirecionamento.';
+$wb['error_proxy_requires_url'] = 'Tipo de redirecionamento \"proxy\" exige uma url como caminho do redirecionamento.';
 $wb['Domain'] = 'Domínio';
 ?>
diff --git a/interface/web/sites/lib/lang/br_cron.lng b/interface/web/sites/lib/lang/br_cron.lng
index 0b8079ac72329ebb905ee6218a61e4b24ee333b9..eab5b9f688c89a6b8efcac26fb39d777592640a4 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -19,8 +19,8 @@ $wb['run_wday_error_format'] = 'Formato dos dias da semana é inválido.';
 $wb['command_error_format'] = 'Formato de comando é inválido. Somente endereços url http/https são permitidos.';
 $wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
 $wb['server_id_error_empty'] = 'O ID do servidor está em branco.';
-$wb['limit_cron_url_txt'] = 'Somente url do cron. Por favor, insira uma url iniciando com "http://" e um comando do cron.';
+$wb['limit_cron_url_txt'] = 'Somente url do cron. Por favor, insira uma url iniciando com \"http://\" e um comando do cron.';
 $wb['command_error_empty'] = 'Comando está em branco.';
-$wb['command_hint_txt'] = 'Você poderá usar, por exemplo: "/var/www/clients/clientX/webY/meu_script.sh" ou "http://www.dominio.com.br/path/script.php" e também a palavra reservada "[web_root]" substituído por "/var/www/clients/clientX/webY/web".';
+$wb['command_hint_txt'] = 'Você poderá usar, por exemplo: \"/var/www/clients/clientX/webY/meu_script.sh\" ou \"http://www.dominio.com.br/path/script.php\" e também a palavra reservada \"[web_root]\" substituído por \"/var/www/clients/clientX/webY/web\".';
 $wb['log_output_txt'] = 'Saída do Log';
 ?>
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index 5be0325e123bcb91d2c46275570a32d4ee197774..57b97693eb8a97ebe0afb793ae5d3d2bf0055797 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -23,7 +23,7 @@ $wb['database_remote_error_ips'] = 'Pelo menos um dos endereços IP informados n
 $wb['database_name_error_len'] = 'Nome do banco de dados - {db} - é muito longo. 64 caracteres, incluindo o prefixo, é o limite permitido.';
 $wb['database_user_error_len'] = 'Nome do usuário do banco de dados \'{user}\' é muito longo. 16 caracteres, incluindo o prefixo, é o limite permitido.';
 $wb['parent_domain_id_txt'] = 'Site';
-$wb['database_site_error_empty'] = 'Selecione o "site" ao qual o banco de dados pertence.';
+$wb['database_site_error_empty'] = 'Selecione o \"site\" ao qual o banco de dados pertence.';
 $wb['select_site_txt'] = '- Selecionar site -';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Cancelar';
diff --git a/interface/web/sites/lib/lang/br_database_user.lng b/interface/web/sites/lib/lang/br_database_user.lng
index 16f2088f2fe318aaefe4d08d0bac779238a96b75..518f0296e1c28a9fbbc6911fae73a1e74d3de6d8 100644
--- a/interface/web/sites/lib/lang/br_database_user.lng
+++ b/interface/web/sites/lib/lang/br_database_user.lng
@@ -6,7 +6,7 @@ $wb['client_txt'] = 'Cliente';
 $wb['active_txt'] = 'Ativo';
 $wb['database_user_error_empty'] = 'Usuário do banco de dados está em branco.';
 $wb['database_user_error_unique'] = 'Já existe um usuário do banco de dados com este nome no servidor. Para configurar um nome exclusivo, use como prefixo o domínio para o nome do usuário.';
-$wb['database_user_error_regex'] = 'Usuário do banco de dados inválido! O nome do usuário pode conter os seguintes caracteres: \'"a-z\', \'A-Z\', \'0-9\' e o \'underscore\'. Tamanho: 2 - 64 caracteres.';
+$wb['database_user_error_regex'] = 'Usuário do banco de dados inválido! O nome do usuário pode conter os seguintes caracteres: \'\"a-z\', \'A-Z\', \'0-9\' e o \'underscore\'. Tamanho: 2 - 64 caracteres.';
 $wb['database_user_error_len'] = 'O usuário do banco de dados - {user} - é muito longo. O limite do nome do usuário, incluindo o prefixo, são 16 caracteres.';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Cancelar';
diff --git a/interface/web/sites/lib/lang/br_ftp_user.lng b/interface/web/sites/lib/lang/br_ftp_user.lng
index a98cae2752d728908088a24ac03eed3516e6b4e5..bb8d99ceb05622cced7949ca108500fe6bfa80e4 100644
--- a/interface/web/sites/lib/lang/br_ftp_user.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user.lng
@@ -25,8 +25,8 @@ $wb['directory_error_empty'] = 'Diretório está em branco.';
 $wb['directory_error_notinweb'] = 'O diretório não está dentro do diretório web principal.';
 $wb['parent_domain_id_error_empty'] = 'Nenhum site selecionado.';
 $wb['quota_size_error_regex'] = 'Cota: insira -1 para ilimitado ou um número > 0';
-$wb['dir_dot_error'] = 'Não é permitido ".." no caminho.';
-$wb['dir_slashdot_error'] = 'Não é permitido "./" no caminho.';
+$wb['dir_dot_error'] = 'Não é permitido \"..\" no caminho.';
+$wb['dir_slashdot_error'] = 'Não é permitido \"./\" no caminho.';
 $wb['generate_password_txt'] = 'Gerar senha';
 $wb['repeat_password_txt'] = 'Repetir senha';
 $wb['password_mismatch_txt'] = 'A senhas não coincidem.';
diff --git a/interface/web/sites/lib/lang/br_shell_user.lng b/interface/web/sites/lib/lang/br_shell_user.lng
index 7b4935e0a2af8f991221fb0afb00b2b089087a5b..c92bf5baa4dff9219f43bf4b2c5997a4f2ccda75 100644
--- a/interface/web/sites/lib/lang/br_shell_user.lng
+++ b/interface/web/sites/lib/lang/br_shell_user.lng
@@ -20,8 +20,8 @@ $wb['parent_domain_id_error_empty'] = 'Nenhum site selecionado.';
 $wb['puser_txt'] = 'Usuário web';
 $wb['pgroup_txt'] = 'Grupo web';
 $wb['ssh_rsa_txt'] = 'Chave pública SSH-RSA (para acessos baseados em chave)';
-$wb['dir_dot_error'] = 'Não é permitido ".." no caminho.';
-$wb['dir_slashdot_error'] = 'Não é permitido  "./" no caminho.';
+$wb['dir_dot_error'] = 'Não é permitido \"..\" no caminho.';
+$wb['dir_slashdot_error'] = 'Não é permitido  \"./\" no caminho.';
 $wb['generate_password_txt'] = 'Gerar senha';
 $wb['repeat_password_txt'] = 'Repetir senha';
 $wb['password_mismatch_txt'] = 'A senhas não coincidem.';
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
index 971b738c4eabe6aba44ed72df4b341c2a7ebcb99..9d4f1951d8090241d70c361f0dc1d4cbffd464d4 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
@@ -14,7 +14,7 @@ $wb['ssl_bundle_txt'] = 'Pacote';
 $wb['ssl_action_txt'] = 'Ação';
 $wb['ssl_domain_txt'] = 'Domínio';
 $wb['server_id_txt'] = 'Servidor';
-$wb['web_folder_error_regex'] = 'Pasta inválida inserida. Por favor, não use barra "/".';
+$wb['web_folder_error_regex'] = 'Pasta inválida inserida. Por favor, não use barra \"/\".';
 $wb['type_txt'] = 'Tipo';
 $wb['parent_domain_id_txt'] = 'Site pai';
 $wb['redirect_type_txt'] = 'Tipo de redirecionamento';
@@ -62,7 +62,7 @@ $wb['ssl_organisation_error_regex'] = 'Campo \'Empresa\' é inválido. São cara
 $wb['ssl_organistaion_unit_error_regex'] = 'Campo \'Departamento\' é inválido. São caracteres válidos: \'a-z\', \'0-9\' e \'.,-_\'.';
 $wb['ssl_country_error_regex'] = 'Campo \'País\' é inválido. São caracteres válidos: \'A-Z\'.';
 $wb['limit_traffic_quota_free_txt'] = 'Cota máxima de tráfego disponível';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: "/teste/" ou "http://www.dominio.com.br/teste/".';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: \"/teste/\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['php_open_basedir_txt'] = 'Diretório open_basedir do PHP';
 $wb['traffic_quota_exceeded_txt'] = 'Cota de tráfego excedida';
 $wb['ruby_txt'] = 'Ruby';
diff --git a/interface/web/sites/lib/lang/br_web_childdomain.lng b/interface/web/sites/lib/lang/br_web_childdomain.lng
index 651b664fd7d4dffdcdb6fdf2bc9a11c5f65fe620..1c53d165842a693423b8c785152334f48304d366 100644
--- a/interface/web/sites/lib/lang/br_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain.lng
@@ -4,8 +4,8 @@ $wb['ssl_locality_txt'] = 'Cidade';
 $wb['ssl_organisation_txt'] = 'Empresa';
 $wb['ssl_organisation_unit_txt'] = 'Departamento';
 $wb['ssl_country_txt'] = 'País';
-$wb['ssl_request_txt'] = 'Requisição';
-$wb['ssl_cert_txt'] = 'Certificado';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
 $wb['ssl_bundle_txt'] = 'Pacote';
 $wb['ssl_action_txt'] = 'Ação';
 $wb['server_id_txt'] = 'Servidor';
@@ -35,19 +35,19 @@ $wb['apache_directives_txt'] = 'Diretivas do apache';
 $wb['domain_error_empty'] = 'Domínio está em branco.';
 $wb['domain_error_unique'] = 'Já existe apelido de domínio ou subdomínio com este nome.';
 $wb['domain_error_regex'] = 'Nome de domínio é inválido.';
-$wb['host_txt'] = 'HostNome do host';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: "/teste/" ou "http://www.dominio.com.br/teste/".';
+$wb['host_txt'] = 'Nome do servidor';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: \"/teste/\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['no_redirect_txt'] = 'Sem redirecionamento';
 $wb['no_flag_txt'] = 'Sem marcas';
 $wb['domain_error_wildcard'] = 'Curingas para subdomínios não são permitidos.';
 $wb['proxy_directives_txt'] = 'Diretivas do proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Diretivas de trechos de código do proxy disponíveis:';
-$wb['error_proxy_requires_url'] = 'O tipo de redirecionamento "proxy" exige uma url no caminho de redirecionamento.';
+$wb['error_proxy_requires_url'] = 'O tipo de redirecionamento \"proxy\" exige uma url no caminho de redirecionamento.';
 $wb['backup_interval_txt'] = 'Intervalo de backup';
 $wb['backup_copies_txt'] = 'Limite de cópias do backup';
 $wb['ssl_key_txt'] = 'Chave';
 $wb['ssl_domain_txt'] = 'Domínio do SSL';
-$wb['web_folder_error_regex'] = 'Pasta inválida informada. Por favor não use uma barra - "/".';
+$wb['web_folder_error_regex'] = 'Pasta inválida informada. Por favor não use uma barra - \"/\".';
 $wb['ipv6_address_txt'] = 'Endereço IPv6';
 $wb['errordocs_txt'] = 'Pasta personalizada Error-Documents';
 $wb['subdomain_txt'] = 'Subdomínio automático';
@@ -98,8 +98,8 @@ $wb['pm_max_children_error_regex'] = 'O valor do PHP-FPM pm.max_children deve se
 $wb['pm_start_servers_error_regex'] = 'O valor do PHP-FPM pm.start_servers deve ser um número positivo.';
 $wb['pm_min_spare_servers_error_regex'] = 'O valor do PHP-FPM pm.min_spare_servers deve ser um número positivo.';
 $wb['pm_max_spare_servers_error_regex'] = 'O valor do PHP-FPM pm.max_spare_servers deve ser um número positivo.';
-$wb['hd_quota_error_regex'] = 'Valor da cota de disco é é inválido.';
-$wb['traffic_quota_error_regex'] = 'Valor da cota de tráfego é é inválido.';
+$wb['hd_quota_error_regex'] = 'Valor da cota de disco é inválido.';
+$wb['traffic_quota_error_regex'] = 'Valor da cota de tráfego é inválido.';
 $wb['fastcgi_php_version_txt'] = 'Versão do PHP';
 $wb['pm_txt'] = 'Gerenciador de Processos do PHP-FPM';
 $wb['pm_process_idle_timeout_txt'] = 'Diretiva PHP-FPM pm.process_idle_timeout';
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Diretivas de trechos de código d
 $wb['available_apache_directive_snippets_txt'] = 'Diretivas de trechos de código do apache disponíveis:';
 $wb['available_nginx_directive_snippets_txt'] = 'Diretivas de trechos de código do nginx disponíveis:';
 $wb['Domain'] = 'Apelido de domínio';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Não adicionar certificado Let\'s Encrypt';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_childdomain_list.lng b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
index a013454f0ccee2be1c42c61f1782e20ba9d4a1b6..20b559b128ad756ccd55299f2fc15a85b1bdd6f7 100644
--- a/interface/web/sites/lib/lang/br_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Adicionar novo subdomínio';
 $wb['add_new_aliasdomain_txt'] = 'Adicionar novo apelido';
 $wb['aliasdomain_list_head_txt'] = 'Apelidos de domínios';
 $wb['subdomain_list_head_txt'] = 'Subdomínios';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
index a199f3273c55e469ada72518455318cda6a7033a..f0fdabb75fc804d157f7fcece4acf9248584d1a4 100644
--- a/interface/web/sites/lib/lang/br_web_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -55,7 +55,7 @@ $wb['ssl_organisation_error_regex'] = 'Campo \'Empresa\' é inválido. São cara
 $wb['ssl_organistaion_unit_error_regex'] = 'Campo \'Departamento\' é inválido. São caracteres válidos: \\"a-z\\", \'0-9\' e \'.,-_\'.';
 $wb['ssl_country_error_regex'] = 'Campo \'País\' é inválido. São caracteres válidos: \'A-Z\'.';
 $wb['limit_traffic_quota_free_txt'] = 'Cota máxima de tráfego disponível';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: "/teste/" ou "http://www.dominio.com.br/teste/".';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: \"/teste/\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['php_open_basedir_txt'] = 'Diretório open_basedir do php';
 $wb['traffic_quota_exceeded_txt'] = 'Cota de tráfego excedida';
 $wb['backup_interval_txt'] = 'Intervalo de backup';
@@ -84,7 +84,7 @@ $wb['pm_max_children_txt'] = 'Diretiva PHP-FPM pm.max_children';
 $wb['pm_start_servers_txt'] = 'Diretiva PHP-FPM pm.start_servers';
 $wb['pm_min_spare_servers_txt'] = 'Diretiva PHP-FPM pm.min_spare_servers';
 $wb['pm_max_spare_servers_txt'] = 'Diretiva PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Valores para as configurações do PHP-FPM pm devem obedecer as seguintes condições:: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['error_php_fpm_pm_settings_txt'] = 'Valores para as configurações do PHP-FPM pm devem obedecer as seguintes condições: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
 $wb['pm_max_children_error_regex'] = 'O valor do PHP-FPM pm.max_children deve ser um número positivo.';
 $wb['pm_start_servers_error_regex'] = 'O valor do PHP-FPM pm.start_servers deve ser um inteiro positvo.';
 $wb['pm_min_spare_servers_error_regex'] = 'O valor do PHP-FPM pm.min_spare_servers deve ser um número positivo.';
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
index 50fe8b5b6620b790e916d4d8e87cc6edf7d7d925..8abb0504384c4b66164b0dde23a133686dd1d794 100644
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_subdomain.lng
@@ -36,7 +36,7 @@ $wb['domain_error_empty'] = 'Domínio está em branco.';
 $wb['domain_error_unique'] = 'Já existe apelido de domínio ou subdomínio com este nome.';
 $wb['domain_error_regex'] = 'Nome do domínio é inválido.';
 $wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: "/teste/" ou "http://www.dominio.com.br/teste/".';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: \"/teste/\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['no_redirect_txt'] = 'Sem redirecionamento';
 $wb['no_flag_txt'] = 'Sem marcas';
 $wb['domain_error_wildcard'] = 'Curingas de subdomínios não são permitidos.';
diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
index 8628d66264bc0f0804690db425921523cf272a8d..f29396c3963290f50c321fb682cc304dfbf3cd53 100644
--- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
@@ -56,7 +56,7 @@ $wb['ssl_organisation_error_regex'] = 'Campo \'Empresa\' é inválido. São cara
 $wb['ssl_organistaion_unit_error_regex'] = 'Campo \'Departamento\' é inválido. São caracteres válidos: \'a-z\', \'0-9\' e \'.,-_\'.';
 $wb['ssl_country_error_regex'] = 'Campo \'País\' é inválido. São caracteres válidos: \'A-Z\'.';
 $wb['limit_traffic_quota_free_txt'] = 'Limite da cota de tráfego';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: "/teste" ou "http://www.dominio.com.br/teste/".';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplos de caminhos válidos: \"/teste\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['php_open_basedir_txt'] = 'Diretório open_basedir do php';
 $wb['traffic_quota_exceeded_txt'] = 'Cota de tráfego excedida';
 $wb['backup_interval_txt'] = 'Intervalo de backup';
@@ -105,7 +105,7 @@ $wb['generate_password_txt'] = 'Gerar senha';
 $wb['repeat_password_txt'] = 'Repetir senha';
 $wb['password_mismatch_txt'] = 'A senhas não coincidem.';
 $wb['password_match_txt'] = 'A senhas coincidem.';
-$wb['web_folder_error_regex'] = 'Pasta inválida informada. Por favor não insira barra - "\".';
+$wb['web_folder_error_regex'] = 'Pasta inválida informada. Por favor não insira barra - \"\\".';
 $wb['domain_error_autosub'] = 'Já existe um subdomínio com essas configurações.';
 $wb['available_php_directive_snippets_txt'] = 'Diretivas de trechos de código do php disponíveis:';
 $wb['available_apache_directive_snippets_txt'] = 'Diretivas de trechos de código do apache disponíveis:';
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'O servidor selecionado não é permitido para est
 $wb['subdomain_error_empty'] = 'O campo subdomínio está em branco ou contém caracteres inválidos.';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Cancelar';
-$wb['enable_spdy_txt'] = 'Habilitar SPDY';
+$wb['enable_spdy_txt'] = 'Habilitar SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Carregas detalhes do cliente';
 $wb['load_my_data_txt'] = 'Carregar detalhes do contato';
 $wb['reset_client_data_txt'] = 'Limpar dados';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Tempo de armazenamenro dos arquivos de log';
 $wb['log_retention_error_regex'] = 'Tempo de armazenamento, em dias (valores permitidos: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
index ef8fb48602fe806dae4ee4fb3dc89f6765748c02..8a0c3e6a1fae58ad51d757c5feb04a2cc1fae92d 100644
--- a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
@@ -19,7 +19,7 @@ $wb['ssl_domain_txt'] = 'Domínio';
 $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['host_txt'] = 'Hostname';
-$wb['web_folder_error_regex'] = 'Pasta informada é inválida. Por favor, não insira barra - "/".';
+$wb['web_folder_error_regex'] = 'Pasta informada é inválida. Por favor, não insira barra - \"/\".';
 $wb['type_txt'] = 'Tipo';
 $wb['redirect_type_txt'] = 'Tipo de redirecionamento';
 $wb['redirect_path_txt'] = 'Caminho para redirecionamento';
@@ -60,13 +60,13 @@ $wb['client_group_id_txt'] = 'Cliente';
 $wb['stats_password_txt'] = 'Senha para estatísticas web';
 $wb['allow_override_txt'] = 'Diretiva Apache AllowOverride';
 $wb['limit_web_quota_free_txt'] = 'Cota de disco';
-$wb['ssl_state_error_regex'] = 'Campo \'Estado\' é inválido. Caracteres válidos são: \'0-9\' e ".,-_".';
+$wb['ssl_state_error_regex'] = 'Campo \'Estado\' é inválido. Caracteres válidos são: \'0-9\' e \".,-_\".';
 $wb['ssl_locality_error_regex'] = 'Campo \'Cidade\' é inválido. Caracteres válidos são: \'a-z\', \'0-9\' e \'.,-_\'.';
 $wb['ssl_organisation_error_regex'] = 'Campo \'Empresa\' é inválido. Caracteres válidos são: \'a-z\', \'0-9\' e \'.,-_\'.';
 $wb['ssl_organistaion_unit_error_regex'] = 'Campo \'Departamento\' é inválido. Caracteres válidos são: \'a-z\', \'0-9\' e \'.,-_\'.';
 $wb['ssl_country_error_regex'] = 'Campo \'País\' é inválido. Caracteres válidos são: \'A-Z\'.';
 $wb['limit_traffic_quota_free_txt'] = 'Cota de tráfego';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: "/teste/" ou "http://www.dominio.com.br/teste/".';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento é inválido. Exemplo de caminho válido: \"/teste/\" ou \"http://www.dominio.com.br/teste/\".';
 $wb['php_open_basedir_txt'] = 'Diretório open_basedir do PHP';
 $wb['traffic_quota_exceeded_txt'] = 'Cota de tráfego excedida';
 $wb['ruby_txt'] = 'Ruby';
@@ -121,9 +121,9 @@ $wb['allowed_rewrite_rule_directives_txt'] = 'Diretivas Permitidas:';
 $wb['configuration_error_txt'] = 'ERRO DE CONFIGURAÇÃO';
 $wb['variables_txt'] = 'Variáveis';
 $wb['backup_excludes_txt'] = 'Diretórios Excluídos';
-$wb['backup_excludes_note_txt'] = '(Separar múltiplos diretórios por vírgulas. Exemplo: "web/cache/*,web/backup".)';
+$wb['backup_excludes_note_txt'] = '(Separar múltiplos diretórios por vírgulas. Exemplo: \"web/cache/*,web/backup\".)';
 $wb['backup_excludes_error_regex'] = 'Os diretórios excluídos contém caracteres inválidos.';
-$wb['subdomain_error_empty'] = 'O campo "Subdomínio" está em branco ou contém caracteres inválidos.';
+$wb['subdomain_error_empty'] = 'O campo \"Subdomínio\" está em branco ou contém caracteres inválidos.';
 $wb['http_port_txt'] = 'Porta HTTP';
 $wb['https_port_txt'] = 'Porta HTTPS';
 $wb['http_port_error_regex'] = 'Porta HTTP inválida.';
diff --git a/interface/web/sites/lib/lang/br_webdav_user.lng b/interface/web/sites/lib/lang/br_webdav_user.lng
index 67f494d5742011709673190927d7de0e5952a7ff..b135d5e0faa3b5b318d73441c6ee07093600306e 100644
--- a/interface/web/sites/lib/lang/br_webdav_user.lng
+++ b/interface/web/sites/lib/lang/br_webdav_user.lng
@@ -12,8 +12,8 @@ $wb['username_error_unique'] = 'O nome do usuário deve ser exclusivo.';
 $wb['username_error_regex'] = 'O nome do usuário contém caracteres não permitidos.';
 $wb['directory_error_empty'] = 'Diretório está em branco.';
 $wb['parent_domain_id_error_empty'] = 'Nenhum site selecionado.';
-$wb['dir_dot_error'] = 'Não é permitido ".." no caminho.';
-$wb['dir_slashdot_error'] = 'Não é permitido "./" no caminho.';
+$wb['dir_dot_error'] = 'Não é permitido \"..\" no caminho.';
+$wb['dir_slashdot_error'] = 'Não é permitido \"./\" no caminho.';
 $wb['generate_password_txt'] = 'Gerar senha';
 $wb['repeat_password_txt'] = 'Repetir senha';
 $wb['password_mismatch_txt'] = 'A senhas não coincidem.';
diff --git a/interface/web/sites/lib/lang/ca_web_childdomain.lng b/interface/web/sites/lib/lang/ca_web_childdomain.lng
index 9e3968e2fd89656e068999521d087c04c9fa47b8..762acfe244fe2f8c158625c679821afe56d7740d 100644
--- a/interface/web/sites/lib/lang/ca_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ca_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng
index b915021b03bf4ae348546f1066b7f2ab958b2e60..d9563e0f975c8b1023c7884aff324d8df0a509c4 100644
--- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
index 673182950742fd96077d87c7a9e3f3f1f57de39f..c9a46866089adc1e4bc6c1d21d3560087f9d215e 100644
--- a/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/cz_web_childdomain.lng b/interface/web/sites/lib/lang/cz_web_childdomain.lng
index 6f9e2baa0f3d58b08b5834d8289b4a9597b64bdd..5a22de61dee5a526b2455c2029f3a204e531bd70 100644
--- a/interface/web/sites/lib/lang/cz_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Přezdívky domén webové stránky';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/cz_web_childdomain_list.lng b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
index 97b4c6ed9abe2cfc9a272b0043dd02556d47e3a7..c7411d04824aa6f112535458b1bbe3a68ea911e5 100644
--- a/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Vytvořit subdoménu';
 $wb['add_new_aliasdomain_txt'] = 'Vytvořit přezdívku domény';
 $wb['aliasdomain_list_head_txt'] = 'Přezdívky domén';
 $wb['subdomain_list_head_txt'] = 'Subdomény';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
index 435c2b63fb70c7846ee9fced9cc6ba34651172fc..da8be311fbb2c63c67332a1bc87bfda6f898695d 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
@@ -135,7 +135,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Uložit';
 $wb['btn_cancel_txt'] = 'Zrušit';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Nahrát údaje z podrobností registrovaného klienta';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Obnovit údaje (resetovat)';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_childdomain.lng b/interface/web/sites/lib/lang/de_web_childdomain.lng
index c30225a71e426962c8c6fb306ac2683707f3b3da..05b1f1d51d902ff0b4cdb1699b5740b28187137a 100644
--- a/interface/web/sites/lib/lang/de_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-
 $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
 $wb['Domain'] = 'Aliasdomain';
 $wb['ssl_letsencrypt_exclude_txt'] = 'Nicht in Let\'s Encrypt Zertifikat aufnehmen';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_childdomain_list.lng b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
index 136a3d70adbce67c8d4b71ed20ce580e477340c2..3ba596cbcd926c2da8224c6387ce890a941ba0e3 100644
--- a/interface/web/sites/lib/lang/de_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Neue Subdomain hinzufügen';
 $wb['add_new_aliasdomain_txt'] = 'Neue Aliasdomain hinzufügen';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
index 41546c81c5f5bbd92770d0aa9eaac7716fb47e9a..4f34874a11f1d7490f6c8536c502faabea09492a 100644
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -35,7 +35,6 @@ $wb['apache_directives_txt'] = 'Apache-Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
 $wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
-$wb['domain_error_acme_invalid'] = 'Domainname acme.invalid ist nicht erlaubt.';
 $wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
index 84d5b2fd7a8f23802de80f23caf5a63ce36be52b..ecfb1994cd4c19303c80b9e61592a349394fd7b0 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
@@ -135,7 +135,7 @@ $wb['host_txt'] = 'Host';
 $wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
-$wb['enable_spdy_txt'] = 'Aktiviere SPDY';
+$wb['enable_spdy_txt'] = 'Aktiviere SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Kundendaten übernehmen';
 $wb['load_my_data_txt'] = 'Meine Kontaktdaten laden';
 $wb['reset_client_data_txt'] = 'Daten verwerfen';
@@ -154,5 +154,5 @@ $wb['error_domain_change_forbidden'] = 'Der Domainname kann nicht geändert werd
 $wb['error_server_change_not_possible'] = 'Der Server kann nicht geändert werden.';
 $wb['enable_pagespeed_txt'] = 'Enable PageSpeed';
 $wb['log_retention_txt'] = 'Log-Dateien Aufbewahrungszeit';
-$wb['log_retention_error_regex'] = "Aufbewahrungszeit in Tagen (Erlaubte Werte: min. 0 - max. 9999)";
+$wb['log_retention_error_regex'] = 'Aufbewahrungszeit in Tagen (Erlaubte Werte: min. 0 - max. 9999)';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
index 2e3404b99448018e414173e0030ff3a4fb5d255c..89e50f2df4c027deb6ab46e200f9e47ea22f3d20 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
@@ -41,7 +41,6 @@ $wb['apache_directives_txt'] = 'Apache-Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein';
 $wb['domain_error_regex'] = 'Domain-Name ungültig.';
-$wb['domain_error_acme_invalid'] = 'Domainname acme.invalid ist nicht erlaubt.';
 $wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
 $wb['hd_quota_error_empty'] = 'Harddisk-Quota ist leer.';
 $wb['traffic_quota_error_empty'] = 'Traffic-Quota ist leer.';
diff --git a/interface/web/sites/lib/lang/dk_web_childdomain.lng b/interface/web/sites/lib/lang/dk_web_childdomain.lng
index 9e3968e2fd89656e068999521d087c04c9fa47b8..762acfe244fe2f8c158625c679821afe56d7740d 100644
--- a/interface/web/sites/lib/lang/dk_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/dk_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng
index b915021b03bf4ae348546f1066b7f2ab958b2e60..d9563e0f975c8b1023c7884aff324d8df0a509c4 100644
--- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/el_web_childdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
index 43fb55160a1348708bda008421a3489bfb5984d9..3c5cb7a9368eb9dc7e1e1c7452917906db572fe5 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive
 $wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:';
 $wb['Domain'] = 'Ψευδώνυμο domain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
index 8c9111903899296b0c5bba8e2897cf89fd143918..266b6f0a71c1fb7d61cf72d019cdf2c11aec611b 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
index e1ce03d1c5fa226bcc32cf6b9eb81f82b34192ca..1787aa0e33fbeedff7b8d897bcf2a683501143d3 100644
--- a/interface/web/sites/lib/lang/el_web_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -40,7 +40,6 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
 $wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή ένα sub / aliasdomain με αυτό το όνομα domain.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Το όριο αποθηκευτικού χώρου είναι 0 ή δεν έχει οριστεί.';
 $wb['traffic_quota_error_empty'] = 'Το όριο κίνησης δεν έχει οριστεί.';
 $wb['error_ssl_state_empty'] = 'Κενή περιφέρεια SSL.';
diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
index cfaedc4b18f59f6b837e5cb0f100040877d92c27..890e0da38e92682f9107fc16bbf9df52c6b705f5 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
@@ -137,7 +137,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng
index 65fd4a3fd84d40f90ed25cdb0e1a0f4d0f888e18..17d47ed4646d28f8a43c4e3a4fa7222d777903a6 100644
--- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng
@@ -141,7 +141,7 @@ $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid c
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = "Save";
 $wb['btn_cancel_txt'] = "Cancel";
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/es_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/es_web_childdomain.lng b/interface/web/sites/lib/lang/es_web_childdomain.lng
index 7322460b117be8a134a53b770c41db451bedc2c1..25843a0e21f0f9f854d74b07633315a33777c305 100644
--- a/interface/web/sites/lib/lang/es_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_nginx_directive_snippets_txt'] = 'Fragmentos de directivas de ngi
 $wb['Domain'] = 'Alias de dominio';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_childdomain_list.lng b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
index 4192acc183b224c8ba3b17343d0c1c84f030d613..42b55c51a99963e18dab871849c7e5f6aabe5f6e 100644
--- a/interface/web/sites/lib/lang/es_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
index e484620216ef4ef6e6d36e706779ba79cd953752..bde2af3a857767309259169f5478be26221154ab 100644
--- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
@@ -135,7 +135,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/fi_web_childdomain.lng b/interface/web/sites/lib/lang/fi_web_childdomain.lng
index 3959fe53da218120128e91c90e4f5b04569c75b6..5105ba3f2e63dfae2a652b24d331f4f550ed91f7 100755
--- a/interface/web/sites/lib/lang/fi_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_childdomain_list.lng b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
index d0dcf80f072f428abe37508b5db58b297de74d35..9b09740d764aea69fcdc819ae1bf10d9571b7b27 100755
--- a/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
index 74b98d86aa20336066207629921c54c8dbe94dfc..7a4fc41dd4ae4276b3a0e670c2c36d5ffcd34315 100644
--- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/fr_web_childdomain.lng b/interface/web/sites/lib/lang/fr_web_childdomain.lng
index 5eda0b88b7bb400595778b800774eda42678cefa..1be206e1222358a13af16980c93dc0e766bb9fce 100644
--- a/interface/web/sites/lib/lang/fr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_childdomain_list.lng b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
index 4d580ac432f791bf7672cab2cc195d3395601153..ae600d58b2935e4ec7517b7a5d5deb4b315a7b40 100644
--- a/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
index 39a1040d7ba210ca8eced7cff78b28e5cfc0795b..2dafc5f11141685e8b24f1a1cd8e33afa2b59ffb 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid c
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
index 12fedd1e98ef0b6e806bb57ef7e4a5d14820d575..a97883fe46afcaadde1b6b4658db562a0f28c5c2 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/hr_web_childdomain.lng b/interface/web/sites/lib/lang/hr_web_childdomain.lng
index fb95a27ca60a29500ee638a270ecfffadd416dab..99df0d2fdf5bb7ca009d376df5913203dc4b0857 100644
--- a/interface/web/sites/lib/lang/hr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_web_childdomain_list.lng b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
index a03d31256fd537ed06b2b2a8ecbc70646146d615..307783eef9ef0453d251d473da091690901a8566 100644
--- a/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
index ecbc78132d0fc4c00b15166df0143c616a45b9e2..1e49cc5ba0f28d46cef74e75fbb4e564b559df59 100644
--- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/hu_web_childdomain.lng b/interface/web/sites/lib/lang/hu_web_childdomain.lng
index 3714d7f9746594a957c49e6634f5a34f72cdb135..5ac19c3bbc25194eff853e3eb75463ff3bbd218e 100644
--- a/interface/web/sites/lib/lang/hu_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_childdomain_list.lng b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
index 4aafde746628bdd80e37c9e476d5e6ca6ca93971..07a6b1eba33a8f22db28b98cb8c233e481c73433 100644
--- a/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
index e05cce85431f942995666c0190934299f7872c93..a13d237867ef640216872d2b2def7f14dc8f2134 100644
--- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/id_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/id_web_childdomain.lng b/interface/web/sites/lib/lang/id_web_childdomain.lng
index 60d32c30e1217d4c2abaf50bc83e4d3c7b327ce1..d5fd9711a4f08c985d682a09125106caf8d23780 100644
--- a/interface/web/sites/lib/lang/id_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_childdomain_list.lng b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
index a8430177494a8c08f223816b7fe814cdb6680c84..3b02f692cb5d9ee564db970841ef4eb3149fcfd4 100644
--- a/interface/web/sites/lib/lang/id_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
index 7c637d58310c67c58daffd437b48f0a5af5f8149..54490d469a8f40695a3bb1b6dcb462b5ece2381f 100644
--- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/it_web_childdomain.lng b/interface/web/sites/lib/lang/it_web_childdomain.lng
index 9d186b3c8997fb421a3aecaef415d2479eca4a03..3a214e298ed8bdcf56e1c7979760a986a7a20b13 100644
--- a/interface/web/sites/lib/lang/it_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/it_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
index a2cdef8d41a33ed9d4c2bfe44dd30b598db9a6c5..8b3fbccd5779a2812e93d38b00e0a3b2a26c3e12 100644
--- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
@@ -137,7 +137,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/ja_web_childdomain.lng b/interface/web/sites/lib/lang/ja_web_childdomain.lng
index 3776cf8ebed81c9fd24f625e5c33acad186362e9..d59d7bbda5f8b0e1ba839103ea6ed36b1d460d00 100644
--- a/interface/web/sites/lib/lang/ja_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_childdomain_list.lng b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
index 0ca4ef07ce1ea06ec697e05226d02c9605253c0d..cf323fb0365c52281ebeacb2b2bab9292944b85f 100644
--- a/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
index faddd9b76ce2a6f8738ee2da07a132ca367dbc7f..93b98c14efd7e7d9a4cc5714a5675ae90d8b8bbd 100644
--- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
index a1e34834303384d6fe3e1cd8dc8e54b995573013..6f7b86fc4d215176cf4e23bb03471fbf4127100e 100644
--- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Opslaan';
 $wb['btn_cancel_txt'] = 'Annuleren';
-$wb['enable_spdy_txt'] = 'SPDY inschakelen';
+$wb['enable_spdy_txt'] = 'SPDY/HTTP2 inschakelen';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/pl_web_childdomain.lng b/interface/web/sites/lib/lang/pl_web_childdomain.lng
index bd17cd1f6fa4f45c1fc76e64cc53abe143574733..9b8a2b56ba56c8c0433b313ea0db921217eeae6b 100644
--- a/interface/web/sites/lib/lang/pl_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
 $wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
 $wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
 $wb['Domain'] = 'Alias domeny';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_childdomain_list.lng b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
index 011a1232e2eacfb22fffa726d620aaa52dbd50e6..a873352e5fdbeb56f4caa009d8083b46f7b63995 100644
--- a/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
index b8f22335013fde543e8f1af7294be9f571998b5a..e88c3eb6e5deb8780bfefafc95a6e7f0262b9def 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/pt_web_childdomain.lng b/interface/web/sites/lib/lang/pt_web_childdomain.lng
index c903b55d5d781003698253fb18a50cd232b03bd7..4cbc032c198098cf07e042df3b1bf7d87216066d 100644
--- a/interface/web/sites/lib/lang/pt_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_childdomain_list.lng b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
index e3fbef84be22c1738165fe2bf1fc07c9a79faa7f..2339cd45f1becb95677ebb32dd83f9399ff095d1 100644
--- a/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
index ec24cbe806939c4a4c52b66ba2de20ea210901a8..98c078ebce4c9c2e9d5adb1c2d41685d2067ebe6 100644
--- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/ro_web_childdomain.lng b/interface/web/sites/lib/lang/ro_web_childdomain.lng
index f6a69829f5163d204dcb2d57a04feaaf0e347510..30f83e72832e3ea2731b52d04a9253adeae2a843 100644
--- a/interface/web/sites/lib/lang/ro_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_childdomain_list.lng b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
index 502562a216fc343545d32efc0cbad9d11dbd6520..07e7a43f39d0c8e1b93189c0858e9192e77614e8 100644
--- a/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
index 9b8d927272a6750c2d505917a92cc2158eab1af2..7e98b45d02221301f5257938c6dcbf9336d075cd 100644
--- a/interface/web/sites/lib/lang/ro_web_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -37,7 +37,6 @@ $wb['apache_directives_txt'] = 'Apache directive';
 $wb['domain_error_empty'] = 'Domain este necompletat';
 $wb['domain_error_unique'] = 'deja exista un domeniu /subdomeniu asemanator';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota necompletata';
 $wb['traffic_quota_error_empty'] = 'Traffic quota necompletata';
 $wb['error_ssl_state_empty'] = 'SSL Judet necompletata';
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng
index be5ce6ee043e478409d53c62996bc1846b9af8a6..f36685be8ab531f08ec462f59bbbdfba3abba07c 100644
--- a/interface/web/sites/lib/lang/ro_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng
@@ -35,7 +35,6 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain necompletat';
 $wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
 $wb['no_redirect_txt'] = 'No redirect';
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
index 133fe88cdbfd95530d26043d14b941ff356e1c32..0b9cd882f1fab4ab1238faadbcf2885ae1cd5caa 100644
--- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
@@ -137,7 +137,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/ru.lng b/interface/web/sites/lib/lang/ru.lng
index 57799831f137624c884df32227b6181a78edc3dc..6316c21d17d09dd8a5a36dc89a5c0368c5ae5504 100644
--- a/interface/web/sites/lib/lang/ru.lng
+++ b/interface/web/sites/lib/lang/ru.lng
@@ -31,5 +31,5 @@ $wb['Available packages'] = 'Доступные пакеты';
 $wb['Installed packages'] = 'Установленные пакеты';
 $wb['Update Packagelist'] = 'Обновить список пакетов';
 $wb['Subdomain (Vhost)'] = 'Поддомен (Vhost)';
-$wb['error_proxy_requires_url'] = 'Тип редиректа "proxy" требует URL в качестве пути перенаправления.';
+$wb['error_proxy_requires_url'] = 'Тип редиректа \"proxy\" требует URL в качестве пути перенаправления.';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_aps.lng b/interface/web/sites/lib/lang/ru_aps.lng
index b00335355141131394737d9df5972cbfb63eedb0..f403143e5952f9cd716c6ee66c9a03491d9900c6 100644
--- a/interface/web/sites/lib/lang/ru_aps.lng
+++ b/interface/web/sites/lib/lang/ru_aps.lng
@@ -38,14 +38,14 @@ $wb['error_inv_main_location'] = 'Вы  указали некорректную
 $wb['error_license_agreement'] = 'Для продолжения нужно принять лицензионное соглашение.';
 $wb['error_no_database_pw'] = 'Вы предоставили не правильный пароль базы данных.';
 $wb['error_short_database_pw'] = 'Пожалуйста, выберите более длинный пароль базы данных.';
-$wb['error_no_value_for'] = 'Поле "%s" не может быть пустым.';
-$wb['error_short_value_for'] = 'Поле "%s" требует более длинного входного значения.';
-$wb['error_long_value_for'] = 'Поле "%s"требует более короткого входного значения.';
-$wb['error_inv_value_for'] = 'Вы ввели неверное значение для поля "%s".';
-$wb['error_inv_email_for'] = 'Вы ввели некорректный адрес электронной почты для поля "%s".';
-$wb['error_inv_domain_for'] = 'Вы ввели некорректный домен для поля "%s".';
-$wb['error_inv_integer_for'] = 'Вы ввели некорректное число для поля "%s".';
-$wb['error_inv_float_for'] = 'Вы ввели некорректное число с плавающей точкой для поля "%s".';
+$wb['error_no_value_for'] = 'Поле \"%s\" не может быть пустым.';
+$wb['error_short_value_for'] = 'Поле \"%s\" требует более длинного входного значения.';
+$wb['error_long_value_for'] = 'Поле \"%s\"требует более короткого входного значения.';
+$wb['error_inv_value_for'] = 'Вы ввели неверное значение для поля \"%s\".';
+$wb['error_inv_email_for'] = 'Вы ввели некорректный адрес электронной почты для поля \"%s\".';
+$wb['error_inv_domain_for'] = 'Вы ввели некорректный домен для поля \"%s\".';
+$wb['error_inv_integer_for'] = 'Вы ввели некорректное число для поля \"%s\".';
+$wb['error_inv_float_for'] = 'Вы ввели некорректное число с плавающей точкой для поля \"%s\".';
 $wb['error_used_location'] = 'Путь установки уже содержит установочный пакет.';
 $wb['installation_task_txt'] = 'Запланирована установка';
 $wb['installation_error_txt'] = 'Ошибка установки';
diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng
index 01efd60c3ad489761246b7fe4a14f9e691328615..b931b715f27debbdf902487a9fd3e4684ae6230a 100644
--- a/interface/web/sites/lib/lang/ru_database.lng
+++ b/interface/web/sites/lib/lang/ru_database.lng
@@ -13,7 +13,7 @@ $wb['database_name_error_unique'] = 'Имя базы данных уже сущ
 $wb['database_name_error_regex'] = 'Неверное имя базы данных. Имя базы данных может содержать только следующие символы: a-z, A-Z, 0-9 и нижний пробел _. Длина: 2 - 64 символа.';
 $wb['database_user_error_empty'] = 'Логин базы данных пустой';
 $wb['database_user_error_unique'] = 'Такой пользователь базы данных уже существует. Что бы получить уникальное имя, например, сложите название сайта и ваше имя.';
-$wb['database_user_error_regex'] = 'Некорректный логин для базы данных. Логин может содержать только следующие символы: a-z, A-Z, 0-9 и "_". Длина: 2 - 16 символов.';
+$wb['database_user_error_regex'] = 'Некорректный логин для базы данных. Логин может содержать только следующие символы: a-z, A-Z, 0-9 и \"_\". Длина: 2 - 16 символов.';
 $wb['limit_database_txt'] = 'Достигнуто максимальное количество БД.';
 $wb['database_name_change_txt'] = 'Имя базы данных не может быть изменено.';
 $wb['database_charset_change_txt'] = 'Кодировка базы данных не может быть изменена';
diff --git a/interface/web/sites/lib/lang/ru_database_user.lng b/interface/web/sites/lib/lang/ru_database_user.lng
index ad5bda065759d3d81185f30adc078b6270c10edd..df927317ca18c23dbe2fd0b7540aa981255ec1ef 100644
--- a/interface/web/sites/lib/lang/ru_database_user.lng
+++ b/interface/web/sites/lib/lang/ru_database_user.lng
@@ -6,7 +6,7 @@ $wb['client_txt'] = 'Клиент';
 $wb['active_txt'] = 'Активно';
 $wb['database_user_error_empty'] = 'Логин базы данных пустой';
 $wb['database_user_error_unique'] = 'Такой пользователь базы данных уже существует. Что бы получить уникальное имя, например, сложите название сайта и ваше имя.';
-$wb['database_user_error_regex'] = 'Некорректный логин для базы данных. Логин может содержать только следующие символы: a-z, A-Z, 0-9 и "_". Длина: 2 - 16 символов.';
+$wb['database_user_error_regex'] = 'Некорректный логин для базы данных. Логин может содержать только следующие символы: a-z, A-Z, 0-9 и \"_\". Длина: 2 - 16 символов.';
 $wb['database_user_error_len'] = 'Логин для базы данных - {user} - cлишком длинный. Максимальная длина логина - 16 символов';
 $wb['btn_save_txt'] = 'Сохранить';
 $wb['btn_cancel_txt'] = 'Отменить';
diff --git a/interface/web/sites/lib/lang/ru_web_childdomain.lng b/interface/web/sites/lib/lang/ru_web_childdomain.lng
index 6bbbc6ae50fa0f189a667ceaf3cd1b072eb5ae1c..49905e77ea1846b9bf0fc6348ad89f2a919193fa 100644
--- a/interface/web/sites/lib/lang/ru_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'Нет флага';
 $wb['domain_error_wildcard'] = 'Wildcard поддомены не допускаются.';
 $wb['proxy_directives_txt'] = 'Директивы прокси';
 $wb['available_proxy_directive_snippets_txt'] = 'Доступные заготовки директив Proxy:';
-$wb['error_proxy_requires_url'] = 'Тип редиректа "proxy" требует URL в качестве пути перенаправления.';
+$wb['error_proxy_requires_url'] = 'Тип редиректа \"proxy\" требует URL в качестве пути перенаправления.';
 $wb['backup_interval_txt'] = 'Интервал резервного копирования';
 $wb['backup_copies_txt'] = 'Количество резервных копий';
 $wb['ssl_key_txt'] = 'SSL-ключ';
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Доступные заготов
 $wb['available_apache_directive_snippets_txt'] = 'Доступные заготовки директив Apache:';
 $wb['available_nginx_directive_snippets_txt'] = 'Доступные заготовки директив Nginx:';
 $wb['Domain'] = 'Алиас домена';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_childdomain_list.lng b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
index 35efffe9459a5d2254bedb551ee9d53ff4074ac7..c913d7fcc859b4e418d1a8430bf63909b8f50e45 100644
--- a/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Добавить новый поддомен';
 $wb['add_new_aliasdomain_txt'] = 'Добавить новый алиас домена';
 $wb['aliasdomain_list_head_txt'] = 'Алиас доменов';
 $wb['subdomain_list_head_txt'] = 'Поддомены';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
index 716b6b7a5fb0d306a3d1ba1450541347a3013094..46203a18155ebe083b6c0f961c2c397811875aac 100644
--- a/interface/web/sites/lib/lang/ru_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'Нет флага';
 $wb['domain_error_wildcard'] = 'Wildcard-поддомены не допускаются.';
 $wb['proxy_directives_txt'] = 'Директивы прокси';
 $wb['available_proxy_directive_snippets_txt'] = 'Доступные заготовки директив Proxy:';
-$wb['error_proxy_requires_url'] = 'Тип редиректа "proxy" требует URL в качестве пути перенаправления.';
+$wb['error_proxy_requires_url'] = 'Тип редиректа \"proxy\" требует URL в качестве пути перенаправления.';
 $wb['http_port_txt'] = 'Порт HTTP';
 $wb['https_port_txt'] = 'Порт HTTPS';
 $wb['http_port_error_regex'] = 'Некорректный порт HTTP.';
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
index 90b4af30743a17950b04cd81095a902d8ceecbb4..f525fe2025aa23749ca468d76d387c5c665365fc 100644
--- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'Выбранный сервер запрещён
 $wb['subdomain_error_empty'] = 'Поле поддомена пуст или содержит недопустимые символы.';
 $wb['btn_save_txt'] = 'Сохранить';
 $wb['btn_cancel_txt'] = 'Отменить';
-$wb['enable_spdy_txt'] = 'Включить SPDY';
+$wb['enable_spdy_txt'] = 'Включить SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Загрузить информацию о клиенте';
 $wb['load_my_data_txt'] = 'Загрузить мои контактные данные';
 $wb['reset_client_data_txt'] = 'Сброс данных';
@@ -148,4 +148,7 @@ $wb['https_port_txt'] = 'Порт HTTPS';
 $wb['http_port_error_regex'] = 'Некорректный порт HTTP.';
 $wb['https_port_error_regex'] = 'Некорректный порт HTTPS.';
 $wb['enable_pagespeed_txt'] = 'Включить PageSpeed';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['log_retention_txt'] = 'Logfiles retention time';
+$wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/se_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
index 0cbee5b1219730bdf3a356c0ab59758b3d9598cf..8ea34c440978e1ec0920627b26e72315d713eda1 100644
--- a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
@@ -8,7 +8,6 @@ $wb['add_new_record_txt'] = 'Add new aliasdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
diff --git a/interface/web/sites/lib/lang/se_web_childdomain.lng b/interface/web/sites/lib/lang/se_web_childdomain.lng
index 063c47db10e6d83eab71c691f12e609e40aec139..eff6791c65ae3f4baca3b5f282e81100af8c802c 100644
--- a/interface/web/sites/lib/lang/se_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain.lng
@@ -116,4 +116,5 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 8cf7c63473c1276062645c0888b0627a7114b2f6..91fa8c4db56627639c7a3519cad7bea8913bf62a 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -36,7 +36,6 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';
diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
index c8461fee7d9aa475d5a79f4e2ce5528ceaa5f449..28e8c00c7a13d453a02dda8f3fbecdf2a54f48b1 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
@@ -137,7 +137,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
index 87eb5b26dc583f9423bf14e6ca31c798e4d9696c..4149c711493e6b6f06d0e99656a1c65744d4ec46 100644
--- a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
@@ -43,7 +43,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/sk_web_childdomain.lng b/interface/web/sites/lib/lang/sk_web_childdomain.lng
index d460d1efb0f64bcecd587e883f2dc50d21fbdb4c..e0d26667bc7252103db05d4e90deb8daf4985c4a 100644
--- a/interface/web/sites/lib/lang/sk_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_childdomain_list.lng b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
index f050030cd6d08128289b1015156b2f1ca7e820a3..f6cf491a3f45785a1bd7e3db10efb49e00f3b803 100644
--- a/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
index 390e0d171d55f397094a2153e00916df891d1021..75d53c154f19cbe87698dab3fc87df9a71dc8758 100644
--- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
@@ -136,7 +136,7 @@ $wb['server_chosen_not_ok'] = 'The selected server is not allowed for this accou
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
index 7897c16bf742cde9d904cf9a584f660c66252d54..35c9298e710d663f63a4269e06dd1db22c1e644b 100644
--- a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
@@ -47,7 +47,6 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
diff --git a/interface/web/sites/lib/lang/tr_web_childdomain.lng b/interface/web/sites/lib/lang/tr_web_childdomain.lng
index ee35b01a996d63c23d3fdc127cdde4b798c883c5..e11c6a92b584c6f93cf2be6219bb60e9b5fe612b 100644
--- a/interface/web/sites/lib/lang/tr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain.lng
@@ -115,4 +115,6 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
+$wb['ssl_letsencrypt_exclude_txt'] = 'Don\'t add to Let\'s Encrypt certificate';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_web_childdomain_list.lng b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
index b02c6de64a610e2b121f93ae47bd5b056edd1977..26b3acc9e97ddc09fe9ce94ad7cefd606eab3a7f 100644
--- a/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
@@ -14,4 +14,5 @@ $wb['add_new_subdomain_txt'] = 'Add new Subdomain';
 $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['aliasdomain_list_head_txt'] = 'Aliasdomains';
 $wb['subdomain_list_head_txt'] = 'Subdomains';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
index d78b7cead6e5bd8179b2f15fa8636f304bae8069..da55d66e60f12ba15e6724d0cae6a6a04ad045ce 100644
--- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
@@ -135,7 +135,7 @@ $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['enable_spdy_txt'] = 'Enable SPDY/HTTP2';
 $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
@@ -154,4 +154,5 @@ $wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Pleas
 $wb['error_server_change_not_possible'] = 'The server cannot be changed.';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 ?>
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 22a1952704229b8e6321b6d8a3f477f08a64d816..86fd3b294f8f01120a7f20950394ad27b875607a 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -237,6 +237,13 @@
 					{tmpl_var name='directive_snippets_id'}
 				

 			

+			
+				

+					
+					
{tmpl_var name="enable_pagespeed"}

+				

+			
+
             {tmpl_hook name="field_active"}
             

                 
@@ -319,7 +327,8 @@
     });
 	// new Vhostsubdomains/Vhostaliasdomains
 	if(serverId == '') jQuery('#parent_domain_id').trigger('change');
-	
+
+/*	
 	if(jQuery('#directive_snippets_id').val() > 0){
 		jQuery('.pagespeed').show();
 	} else {
@@ -332,6 +341,7 @@
 			jQuery('.pagespeed').hide();
 		}
 	});
+*/
     
     function reloadServerId(noFormChange) {
         var parentWebId = jQuery('#parent_domain_id').val();
@@ -349,6 +359,7 @@
                 var selected = jQuery('#php').val();
                 jQuery('.apache').hide();
 				jQuery('.nginx').show();
+/*
 				if(jQuery('#directive_snippets_id').val() > 0){
 					jQuery('.pagespeed').show();
 				} else {
@@ -361,6 +372,7 @@
 						jQuery('.pagespeed').hide();
 					}
 				});
+*/
                 if(selected != "no" && selected != "php-fpm" && selected != "hhvm") {
                     jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
                 }
diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
index 6b4a2a528f195b8e606f163c5ecd53814dd07c83..e38c08671c7a5899af323fee3e4e90b1776531b2 100644
--- a/interface/web/sites/templates/web_vhost_domain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -81,13 +81,13 @@
                 jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
                 jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
                 jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
-				jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
+				//jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
 					
                 jQuery('#redirect_type option[value="last"]').hide();
                 jQuery('#redirect_type option[value="break"]').hide();
                 jQuery('#redirect_type option[value="redirect"]').hide();
                 jQuery('#redirect_type option[value="permanent"]').hide();
-				jQuery('#redirect_type option[value="proxy"]').hide();
+				//jQuery('#redirect_type option[value="proxy"]').hide();
                 if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
 				jQuery('.nginx').hide();
             }
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index f5a6b6b537b09b2b75f6dc9a9a84c922f25e42ff..674d4c7b23d341e9d6af6a008f73aa72171f44d2 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -244,17 +244,17 @@ class page_action extends tform_actions {
 
 			if($this->_vhostdomain_type == 'domain') {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi'){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
 				}
 			} else {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi'){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 			}
 			$php_select = "";
@@ -388,7 +388,7 @@ class page_action extends tform_actions {
 			if(!empty($web_config[$server_id]['server_type'])) $server_type = $web_config[$server_id]['server_type'];
 			if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
 			$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
-			$sql_where = " AND (client_id = 0 OR client_id = ?)";
+			$sql_where = " AND (client_id = 0 OR client_id = ?) AND active = 'y'";
 			if($this->_vhostdomain_type == 'domain') {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where." ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $selected_client['client_id']);
@@ -398,10 +398,10 @@ class page_action extends tform_actions {
 				}
 			} else {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 			}
 			$php_select = "";
@@ -608,7 +608,7 @@ class page_action extends tform_actions {
 			if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
 			if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
 			$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
-			$sql_where = " AND (client_id = 0 OR client_id = ?)";
+			$sql_where = " AND (client_id = 0 OR client_id = ?) AND active = 'y'";
 			if($this->_vhostdomain_type == 'domain') {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where." ORDER BY name", $server_id, $selected_client['client_id']);
@@ -618,10 +618,10 @@ class page_action extends tform_actions {
 				}
 			} else {
 				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? ORDER BY name", $parent_domain['server_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND active = 'y' ORDER BY name", $parent_domain['server_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
-					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? ORDER BY name", $parent_domain['server_id']);
+					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y' ORDER BY name", $parent_domain['server_id']);
 				}
 			}
 			$php_select = "";
@@ -836,6 +836,7 @@ class page_action extends tform_actions {
 		$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type, true);
 
 		$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
+		$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed'] === 'y'));
 		$app->tpl->setVar("is_admin", $is_admin);
 		
 		if($this->id > 0) {
@@ -1308,7 +1309,7 @@ class page_action extends tform_actions {
 		if($web_config['enable_spdy'] === 'n') {
 			unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
 		}
-		if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';
+	//	if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';
 		
 		//print_r($_POST['folder_directive_snippets']);
 		//print_r($_POST['folder_directive_snippets_id']);
@@ -1338,7 +1339,7 @@ class page_action extends tform_actions {
 		if(isset($this->dataRecord['fastcgi_php_version']) && $this->dataRecord['fastcgi_php_version'] != '') {
 			// Check php-fpm mode
 			if($this->dataRecord['php'] == 'php-fpm'){
-				$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fpm_init_script,':',php_fpm_ini_dir,':',php_fpm_pool_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
+				$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE active = 'y' AND CONCAT(name,':',php_fpm_init_script,':',php_fpm_ini_dir,':',php_fpm_pool_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
 				if(is_array($tmp)) {
 					$this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fpm_init_script'].':'.$tmp['php_fpm_ini_dir'].':'.$tmp['php_fpm_pool_dir'];
 				} else {
@@ -1347,7 +1348,7 @@ class page_action extends tform_actions {
 				unset($tmp);
 			// Check fast-cgi mode
 			} elseif($this->dataRecord['php'] == 'fast-cgi') {
-				$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fastcgi_binary,':',php_fastcgi_ini_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
+				$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE active = 'y' AND CONCAT(name,':',php_fastcgi_binary,':',php_fastcgi_ini_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
 				if(is_array($tmp)) {
 					$this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fastcgi_binary'].':'.$tmp['php_fastcgi_ini_dir'];
 				} else {
@@ -1398,6 +1399,14 @@ class page_action extends tform_actions {
 		$app->uses("getconf");
 		$web_rec = $app->tform->getDataRecord($this->id);
 		$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
+		
+		// get global log retention value as default for web log retention
+		$server_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'server');
+		if($server_config['log_retention'] > 0) {
+			$log_retention = $server_config['log_retention'];
+		} else {
+			$log_retention = 10;
+		}
 
 		if($this->_vhostdomain_type == 'domain') {
 			$document_root = str_replace("[website_id]", $this->id, $web_config["website_path"]);
@@ -1431,8 +1440,8 @@ class page_action extends tform_actions {
 			$htaccess_allow_override = $web_config["htaccess_allow_override"];
 			$added_by = $_SESSION['s']['user']['username'];
 
-			$sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?  WHERE domain_id = ?";
-			$app->db->query($sql, $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $this->id);
+			$sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?, log_retention = ? WHERE domain_id = ?";
+			$app->db->query($sql, $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $log_retention, $this->id);
 		} else  {
 			// Set the values for document_root, system_user and system_group
 			$system_user = $this->parent_domain_record['system_user'];
@@ -1445,8 +1454,8 @@ class page_action extends tform_actions {
 			$htaccess_allow_override = $this->parent_domain_record['allow_override'];
 			$added_by = $_SESSION['s']['user']['username'];
 			
-			$sql = "UPDATE web_domain SET sys_groupid = ?, system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?  WHERE domain_id = ?";
-			$app->db->query($sql, $this->parent_domain_record['sys_groupid'], $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $this->id);
+			$sql = "UPDATE web_domain SET sys_groupid = ?, system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ?, added_date = CURDATE(), added_by = ?, log_retention = ? WHERE domain_id = ?";
+			$app->db->query($sql, $this->parent_domain_record['sys_groupid'], $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $added_by, $log_retention, $this->id);
 		}
 		if(isset($this->dataRecord['folder_directive_snippets'])) $app->db->query("UPDATE web_domain SET folder_directive_snippets = ? WHERE domain_id = ?", $this->dataRecord['folder_directive_snippets'], $this->id);
 		
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index d279016f0d529cfc7c9e33c7657154658ae82b0d..50262cb19e36a349f77ccb461bf47f96604d8492 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -3,7 +3,7 @@
 
   
 
-  <tmpl_var name="company_name"><tmpl_var name="app_title"> <tmpl_var name="app_version">
+  <tmpl_var name="company_name"><tmpl_var name="app_title">
 
   
   
diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/ar_resync.lng
+++ b/interface/web/tools/lib/lang/ar_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/bg_resync.lng
+++ b/interface/web/tools/lib/lang/bg_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng
index a23f33456b6e96e5a9a6c5252c651adae053fd5b..bf854b33b31405b59fb49f3d94c6f9a33a0b9143 100644
--- a/interface/web/tools/lib/lang/br_resync.lng
+++ b/interface/web/tools/lib/lang/br_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Políticas anti-spam sincronizadas';
 $wb['do_mail_spamfilter_txt'] = 'Filtros anti-spam sincronizados';
 $wb['do_mailget_txt'] = 'Contas de busca de e-mail sincronizadas';
 $wb['resync_mailget_txt'] = 'Contas de busca de e-mails';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ca_resync.lng b/interface/web/tools/lib/lang/ca_resync.lng
index b1f9cc2a649fe0b4a30c8b9bbc607c6c7b6fdbfb..2e7ff4f5524e12ab602703f07b5b26b7f981d888 100644
--- a/interface/web/tools/lib/lang/ca_resync.lng
+++ b/interface/web/tools/lib/lang/ca_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 80cd0e87cf4a6dfc57b1b3b3102037c23d5d67aa..b881c7d01a40dbc59c1795f20fa7e5123c704232 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Proběhla resynchronizace externího získávání e-mailů';
 $wb['resync_mailget_txt'] = 'Externí získávání e-mailů';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
index 20f4568519832199023c1511f6034ca8a8a67170..5a9a60e15fb91c684e1b228b339fe151a03abf16 100644
--- a/interface/web/tools/lib/lang/de_resync.lng
+++ b/interface/web/tools/lib/lang/de_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'E-Mail Sammeldienst';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/dk_resync.lng b/interface/web/tools/lib/lang/dk_resync.lng
index 291bbc120ae5be5df30463b24a60a8711e224c51..0a02ebe63b669289b1f5a7c19ca9770c2311c1ba 100644
--- a/interface/web/tools/lib/lang/dk_resync.lng
+++ b/interface/web/tools/lib/lang/dk_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/en_resync.lng b/interface/web/tools/lib/lang/en_resync.lng
index 59767a134ab9fa16ea2a2807689a328705bc3d6f..09f51c28435cbe8d15ddd0ef3545da14504ea5e9 100644
--- a/interface/web/tools/lib/lang/en_resync.lng
+++ b/interface/web/tools/lib/lang/en_resync.lng
@@ -46,4 +46,8 @@ $wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
 $wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
 $wb["do_mailget_txt"] = "Resynced Fetchmail";
 $wb["resync_mailget_txt"] = "Fetchmail";
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng
index 3f871c20bb2090eed5bfb256655c75d9f6abb8f6..ae4d870b93f856dde9835daf206ae30899ee517a 100644
--- a/interface/web/tools/lib/lang/es_resync.lng
+++ b/interface/web/tools/lib/lang/es_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/fi_resync.lng
+++ b/interface/web/tools/lib/lang/fi_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng
index dad0b41c65e31d2196587fbc12eb2fdb10147725..2e90b4e1d081fc74d1f79188d25223814fbfa8ca 100644
--- a/interface/web/tools/lib/lang/fr_resync.lng
+++ b/interface/web/tools/lib/lang/fr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/hr_resync.lng
+++ b/interface/web/tools/lib/lang/hr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/hu_resync.lng
+++ b/interface/web/tools/lib/lang/hu_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/id_resync.lng
+++ b/interface/web/tools/lib/lang/id_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/it_resync.lng
+++ b/interface/web/tools/lib/lang/it_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/ja_resync.lng
+++ b/interface/web/tools/lib/lang/ja_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/nl_resync.lng
+++ b/interface/web/tools/lib/lang/nl_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/pt_resync.lng
+++ b/interface/web/tools/lib/lang/pt_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/ro_resync.lng
+++ b/interface/web/tools/lib/lang/ro_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng
index ec8b81f695052187e97b4c207601bbb0cfd8ec62..c78f2d75d8c9b97000db0cb5d9f96f0c538a0e04 100644
--- a/interface/web/tools/lib/lang/ru_resync.lng
+++ b/interface/web/tools/lib/lang/ru_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Ресинхронизация прав
 $wb['do_mail_spamfilter_txt'] = 'Ресинхронизация спам-фильтров';
 $wb['do_mailget_txt'] = 'Ресинхронизация сборщиков почты';
 $wb['resync_mailget_txt'] = 'Сборщики почты';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/se_resync.lng
+++ b/interface/web/tools/lib/lang/se_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng
index cfb7dc1a395bfeabd39bbe0e251014c87944da8d..42831b890be9d9590be70588fdce332c39ba7ddb 100644
--- a/interface/web/tools/lib/lang/sk_resync.lng
+++ b/interface/web/tools/lib/lang/sk_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng
index ea7b2c0f3459ddf991349959d5ba4c6ba49616ef..71ebb0dda2b463c28ebce0184f86206b0f0af470 100644
--- a/interface/web/tools/lib/lang/tr_resync.lng
+++ b/interface/web/tools/lib/lang/tr_resync.lng
@@ -46,4 +46,8 @@ $wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
 $wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
 $wb['do_mailget_txt'] = 'Resynced Fetchmail';
 $wb['resync_mailget_txt'] = 'Fetchmail';
+$wb['resync_mailtransport_txt'] = 'E-Mail Transport';
+$wb['resync_mailrelay_txt'] = 'E-Mail Relay';
+$wb['do_mailtransport_txt'] = 'Resynced Mailtransport';
+$wb['do_mailrelay_txt'] = 'Resynced Mailrelay';
 ?>
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index d953def54ca4b5a6910d3783df6f7802e35249c1..7e3e9b4da2f55410659ab6e92d8ca166dde5d2d8 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -113,6 +113,16 @@ class page_action extends tform_actions {
         			'server_type' => 'mail',
 					'server_id' => $server_id,
 				),
+    			'mail_transport' => array (
+        			'index_field' =>  'transport_id',
+        			'server_type' => 'mail',
+					'server_id' => $server_id,
+				),
+    			'mail_relay' => array (
+        			'index_field' =>  'relay_recipient_id',
+        			'server_type' => 'mail',
+					'server_id' => $server_id,
+				),
 			);
 		}
 		if($type == 'mail_filter') {
@@ -292,6 +302,27 @@ class page_action extends tform_actions {
 				unset($options_servers);
 			}
 
+			//* mailtransport
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_transport');
+			$options_servers = $server_list[0];$server_count = $server_list[1];
+			unset($server_list);
+			if (isset($options_servers)) {	//* server with data found
+				if ($server_count > 1) $options_servers = "" . $options_servers;
+				$app->tpl->setVar('mailtransport_server_id', $options_servers);
+				$app->tpl->setVar('mailtransport_found', 1);
+				unset($options_servers);
+			}
+
+			//* mailrelay
+			$server_list = $this->create_list($mail_server_rec, 'mail', 'mail_relay');
+			$options_servers = $server_list[0];$server_count = $server_list[1];
+			unset($server_list);
+			if (isset($options_servers)) {	//* server with data found
+				if ($server_count > 1) $options_servers = "" . $options_servers;
+				$app->tpl->setVar('mailrelay_server_id', $options_servers);
+				$app->tpl->setVar('mailrelay_found', 1);
+				unset($options_servers);
+			}
 		}
 
 		//* fetch web-server
@@ -481,6 +512,8 @@ class page_action extends tform_actions {
 			$this->dataRecord['resync_mailbox'] = 1;
 			$this->dataRecord['resync_mailfilter'] = 1;
 			$this->dataRecord['resync_mailinglist'] = 1;
+			$this->dataRecord['resync_mailtransport'] = 1;
+			$this->dataRecord['resync_mailrelay'] = 1;
 			$this->dataRecord['resync_vserver'] = 1;
 			$this->dataRecord['resync_dns'] = 1;
 			$this->dataRecord['resync_client'] = 1;
@@ -553,6 +586,14 @@ class page_action extends tform_actions {
 		if($this->dataRecord['resync_mailinglist'] == 1) 
 			$msg .= $this->do_resync('mail_mailinglist', 'mailinglist_id', 'mail', $this->dataRecord['mail_server_id'], 'listname',  $app->tform->wordbook['do_mailinglist_txt'], false);
 
+		//* mailtransport
+		if($this->dataRecord['resync_mailtransport'] == 1) 
+			$msg .= $this->do_resync('mail_transport', 'transport_id', 'mail', $this->dataRecord['mail_server_id'], 'domain',  $app->tform->wordbook['do_mailtransport_txt'], false);
+
+		//* mailrelay
+		if($this->dataRecord['resync_mailrelay'] == 1) 
+			$msg .= $this->do_resync('mail_relay_recipient', 'relay_recipient_id', 'mail', $this->dataRecord['mail_server_id'], 'source',  $app->tform->wordbook['do_mailrelay_txt'], false);
+
 		//* vserver
 		if($this->dataRecord['resync_vserver'] == 1) 
 			$msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['verserver_server_id'], 'hostname',  $app->tform->wordbook['do_vserver_txt']);
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index a0b3861c06136a2343952e51c4aa966ef0560366..3e66290fb0fd46e2117a7550bf0d0a12e18d76cd 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -96,9 +96,22 @@
 			

 		

 	
+	
+		

+			
+			

+			

+		

+	
+	
+		

+			
+			

+			

+		

+	
 
 
-
 
 	
 		

diff --git a/security/security_settings.ini b/security/security_settings.ini
index d7b65ba48ec23aac32b1d6296f66962ea3ae662e..24f4e38d209d6875c43538a09afb3a744ee2aa43 100644
--- a/security/security_settings.ini
+++ b/security/security_settings.ini
@@ -21,15 +21,15 @@ session_regenerate_id=yes
 [ids]
 ids_anon_enabled=yes
 ids_anon_log_level=1
-ids_anon_warn_level=5
+ids_anon_warn_level=15
 ids_anon_block_level=20
 ids_user_enabled=yes
 ids_user_log_level=1
-ids_user_warn_level=10
-ids_user_block_level=25
+ids_user_warn_level=27
+ids_user_block_level=30
 ids_admin_enabled=no
 ids_admin_log_level=1
-ids_admin_warn_level=5
+ids_admin_warn_level=90
 ids_admin_block_level=100
 sql_scan_enabled=yes
 sql_scan_action=warn
diff --git a/server/conf/apache_apps.vhost.master b/server/conf/apache_apps.vhost.master
index 86814064a86ea6f21d2e4af1e2565597795b362f..7dc2fd9ddf679462b6bb71740edc7a08625f17cc 100644
--- a/server/conf/apache_apps.vhost.master
+++ b/server/conf/apache_apps.vhost.master
@@ -33,6 +33,21 @@
     
   
   
+  
+    DocumentRoot {tmpl_var name='apps_vhost_dir'}
+    AddType application/x-httpd-php .php
+    
+		Options FollowSymLinks
+		AllowOverride None
+		
+		Require all granted
+		
+		Order allow,deny
+		Allow from all
+		
+    
+  
+  
   
     DocumentRoot {tmpl_var name='apps_vhost_dir'}
     SuexecUserGroup ispapps ispapps
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 74277a2637c5d6cc390046a257dad56d7f825313..6165f0496b1624fef7f5aefdeb81717413359974 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -18,8 +18,12 @@ SSLStaplingCache shmcb:/var/run/ocsp(128000)
 LogFormat '%v %h %l %u %t "%r" %>s %S "%{Referer}i" "%{User-Agent}i"' combined_ispconfig
 
 LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
+
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
+
+
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
 
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
 
 
     AllowOverride None
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 683b1c2a0a194649e1a7c5a5856feb53b1957c83..9fcb2ae8235124d66bdf6140d61890e7cc3042bf 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -125,8 +125,14 @@ server {
         }
 
 		
+
         error_log /var/log/ispconfig/httpd//error.log;
         access_log /var/log/ispconfig/httpd//access.log combined;
+
+
+        error_log /var/log/ispconfig/httpd//error.log;
+        access_log /var/log/ispconfig/httpd//access.log anonymized;
+
 
         ## Disable .htaccess and other hidden files
 		location ~ /\. {
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index f90e14d20ed43a6afe33fb055f16e5292de74421..b3ed93960fd8bea1402dcc2eec0397e030e80656 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -43,7 +43,20 @@
 
 		ServerAdmin webmaster@
 
+
+
+		Protocols h2 http/1.1
+		SSLProtocol All -SSLv2 -SSLv3
+		SSLCipherSuite 'EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS'
+
+
+
+
+		ErrorLog "|/usr/local/ispconfig/server/scripts/vlogger -e -n -P -t \"error.log\" /var/log/ispconfig/httpd/"
+
+
 		ErrorLog /var/log/ispconfig/httpd//error.log
+
 
 
 		Alias /error/ "/error/"
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 117af30b8a0c7ec3599b3abe2b05d30b697648dd..ce2a5484fcf5efc8671727a954d5897259b8fa2a 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -117,7 +117,7 @@ class app {
          2 = ERROR
         */
 
-	function log($msg, $priority = 0) {
+	function log($msg, $priority = 0, $dblog = true) {
 
 		global $conf;
 
@@ -148,7 +148,7 @@ class app {
 			fclose($fp);
 
 			// Log to database
-			if(isset($this->dbmaster)) {
+			if($dblog === true && isset($this->dbmaster)) {
 				$server_id = $conf['server_id'];
 				$loglevel = $priority;
 				$message = $msg;
diff --git a/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php b/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php
index eb92c2de9dda64a9be93723830696fe70fd00c41..1bae04cc521c4ebd069cb83536a8f5ed564a09a5 100644
--- a/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php
@@ -74,7 +74,7 @@ class cronjob_monitor_disk_usage extends cronjob {
 		$app->uses('getconf');
 		$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
 		
-		$dfData = shell_exec('df -hT -x simfs | awk \'!x[$1]++\' 2>/dev/null');
+		$dfData = shell_exec('df -PhT -x simfs | awk \'!x[$1]++\' 2>/dev/null');
 		
 		// split into array
 		$df = explode("\n", $dfData);
diff --git a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
index d5beee70bcf1dac36ac38f1f2bf7108bd9c4e5a2..43071b83872b26048266ba9250dff926c6997d95 100644
--- a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
@@ -72,7 +72,13 @@ class cronjob_monitor_rkhunter extends cronjob {
 			/*
 			 * Fetch the output
 			 */
-			$data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress');
+			
+			// Do not try to update rkhunter on Debian and Ubuntu, rkhunter is keept up to date with apt.
+			if(file_exists('/etc/debian_version')) {
+				$data['output'] = shell_exec('rkhunter --checkall --nocolors --skip-keypress');
+			} else {
+				$data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress');
+			}
 
 			/*
 			 * At this moment, there is no state (maybe later)
diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php
index 97f6c77f413887d0e404e309e7b7646fca748da4..40778a8a13abcb96888b2eaf868bf97578fa9e15 100644
--- a/server/lib/classes/cron.d/200-logfiles.inc.php
+++ b/server/lib/classes/cron.d/200-logfiles.inc.php
@@ -49,6 +49,15 @@ class cronjob_logfiles extends cronjob {
 
 	public function onRunJob() {
 		global $app, $conf;
+		
+		$app->uses('getconf');
+		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+		
+		if($server_config['log_retention'] > 0) {
+			$max_syslog = $server_config['log_retention'];
+		} else {
+			$max_syslog = 10;
+		}
 
 		//######################################################################################################
 		// Make the web logfiles directories world readable to enable ftp access
@@ -76,7 +85,7 @@ class cronjob_logfiles extends cronjob {
 				unset($tmp);
 			}
 
-                        $log_retention = $rec['log_retention'];
+			$log_retention = $rec['log_retention'];
 
 			$logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log';
 			$total_bytes = 0;
@@ -118,9 +127,9 @@ class cronjob_logfiles extends cronjob {
 				$cron_logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/' . $cron_logfile);
 				
 				// rename older files (move up by one)
-				$num = 7;
-				while($num >= 1 && is_file($cron_logfile . '.' . $num . '.gz')) {
-					rename($cron_logfile . '.' . $num . '.gz', $cron_logfile . '.' . ($num + 1) . '.gz');
+				$num = $log_retention;
+				while($num >= 1) {
+					if(is_file($cron_logfile . '.' . $num . '.gz')) rename($cron_logfile . '.' . $num . '.gz', $cron_logfile . '.' . ($num + 1) . '.gz');
 					$num--;
 				}
 				
@@ -130,37 +139,43 @@ class cronjob_logfiles extends cronjob {
 					exec("cat /dev/null > $cron_logfile");
 				}
 				// remove older logs
-				$num = 7;
+				$num = $log_retention;
 				while(is_file($cron_logfile . '.' . $num . '.gz')) {
 					@unlink($cron_logfile . '.' . $num . '.gz');
 					$num++;
 				}
 			}
 
-			// rotate and compress the error.log when it exceeds a size of 10 MB
-			$logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/error.log');
-			if(is_file($logfile) && filesize($logfile) > 10000000) {
-				exec("gzip -c $logfile > $logfile.1.gz");
-				exec("cat /dev/null > $logfile");
+			// rotate and compress the error.log 
+			$error_logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/error.log');
+			// rename older files (move up by one)
+			$num = $log_retention;
+			while($num >= 1 && is_file($error_logfile . '.' . $num . '.gz')) {
+				rename($error_logfile . '.' . $num . '.gz', $error_logfile . '.' . ($num + 1) . '.gz');
+				$num--;
+			}
+			// compress current logfile
+			if(is_file($error_logfile)) {
+				exec("gzip -c $error_logfile > $error_logfile.1.gz");
+				exec("cat /dev/null > $error_logfile");
 			}
 
-			// delete logfiles after x days (default 30)
-                        if($log_retention > 0) {
-                        foreach (glob($rec['document_root'].'/' . $log_folder . '/'."*.log*") as $logfile) {
-                        $now   = time();
-                        if (is_file($logfile))
-                                if ($now - filemtime($logfile) >= 60 * 60 * 24 * $log_retention)
-                                        unlink($logfile);
-                        }
-
-                        }
+			// delete logfiles after x days (default 10)
+			if($log_retention > 0) {
+				foreach (glob($rec['document_root'].'/' . $log_folder . '/'."*.log*") as $logfile) {
+					$now = time();
+					if (is_file($logfile))
+						if ($now - filemtime($logfile) >= 60 * 60 * 24 * $log_retention)
+							unlink($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");
+			exec('cd /var/log/ispconfig/httpd/'.$tmp_hostname[0]."; find . -mtime +$max_syslog -name '*.log' | xargs rm > /dev/null 2> /dev/null");
 		}
 		unset($tmp_hostname);
 
@@ -168,25 +183,27 @@ class cronjob_logfiles extends cronjob {
 		// Rotate the ispconfig.log file
 		//######################################################################################################
 
-		// rotate the ispconfig.log when it exceeds a size of 10 MB
-		$logfile = $conf['ispconfig_log_dir'].'/ispconfig.log';
-		if(is_file($logfile) && filesize($logfile) > 10000000) {
-			exec("gzip -c $logfile > $logfile.1.gz");
-			exec("cat /dev/null > $logfile");
-		}
 
-		// rotate the cron.log when it exceeds a size of 10 MB
-		$logfile = $conf['ispconfig_log_dir'].'/cron.log';
-		if(is_file($logfile) && filesize($logfile) > 10000000) {
-			exec("gzip -c $logfile > $logfile.1.gz");
-			exec("cat /dev/null > $logfile");
-		}
-
-		// rotate the auth.log when it exceeds a size of 10 MB
-		$logfile = $conf['ispconfig_log_dir'].'/auth.log';
-		if(is_file($logfile) && filesize($logfile) > 10000000) {
-			exec("gzip -c $logfile > $logfile.1.gz");
-			exec("cat /dev/null > $logfile");
+		$ispconfig_logfiles = array('ispconfig.log', 'cron.log', 'auth.log');
+		foreach($ispconfig_logfiles as $ispconfig_logfile) {
+			$num = $max_syslog;
+			$ispconfig_logfile = escapeshellcmd($conf['ispconfig_log_dir'].'/'.$ispconfig_logfile);
+			// rename older files (move up by one)
+			while($num >= 1) {
+				if(is_file($ispconfig_logfile . '.' . $num . '.gz')) rename($ispconfig_logfile . '.' . $num . '.gz', $ispconfig_logfile . '.' . ($num + 1) . '.gz');
+				$num--;
+			}
+			// compress current logfile
+			if(is_file($ispconfig_logfile)) {
+				exec("gzip -c $ispconfig_logfile > $ispconfig_logfile.1.gz");
+				exec("cat /dev/null > $ispconfig_logfile");
+			}
+			// remove older logs
+			$num = $max_syslog;
+			while(is_file($ispconfig_logfile . '.' . $num . '.gz')) {
+				@unlink($ispconfig_logfile . '.' . $num . '.gz');
+				$num++;
+			}
 		}
 
 		//######################################################################################################
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 9a7968caea5ef3e004a7727c0b81ba1acc2c30eb..4eb691ce4422dc6c3683957b3b73f6f0e5c7d4e1 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -474,7 +474,7 @@ class db
 		if($this->show_error_messages && $conf['demo_mode'] === false) {
 			echo $sErrormsg . $sAddMsg;
 		} elseif(is_object($app) && method_exists($app, 'log') && $bNoLog == false) {
-			$app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
+			$app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN, false);
 		} elseif(php_sapi_name() == 'cli') {
 			echo $sErrormsg . $sAddMsg;
 		}
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 69ca8e1bd12e846f63c17659d6c0b1d84b3501fc..b70c64571dd5c4c49ba5588644e87d89fc1a5eed 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -87,6 +87,10 @@ class monitor_tools {
 				$mainver = $ver;
 			}
 			switch ($mainver){
+			case "18.04":
+				$relname = "(Bionic Beaver)";
+				$distconfid = 'ubuntu1804';
+				break;
 			case "17.10":
 				$relname = "(Artful Aardvark)";
 				$distconfid = 'ubuntu1710';
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index f0696ef0ee57448f06f33a58c5689b6b9057b690..cbf9f209683980fe2a04682e6222abf91a368883 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -73,6 +73,9 @@ class apache2_plugin {
 		$app->plugins->registerEvent('server_ip_insert', $this->plugin_name, 'server_ip');
 		$app->plugins->registerEvent('server_ip_update', $this->plugin_name, 'server_ip');
 		$app->plugins->registerEvent('server_ip_delete', $this->plugin_name, 'server_ip');
+		
+		$app->plugins->registerEvent('server_insert', $this->plugin_name, 'server_ip');
+		$app->plugins->registerEvent('server_update', $this->plugin_name, 'server_ip');
 
 		$app->plugins->registerEvent('webdav_user_insert', $this->plugin_name, 'webdav');
 		$app->plugins->registerEvent('webdav_user_update', $this->plugin_name, 'webdav');
@@ -264,7 +267,7 @@ class apache2_plugin {
 		if($data["new"]["type"] != "vhost" && $data["new"]["type"] != "vhostsubdomain" && $data["new"]["type"] != "vhostalias") return;
 
 		// if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
-		if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
+		if(!is_dir($data['new']['document_root'].'/ssl') && !is_dir($data['old']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
 
 		$ssl_dir = $data['new']['document_root'].'/ssl';
 		$domain = ($data['new']['ssl_domain'] != '') ? $data['new']['ssl_domain'] : $data['new']['domain'];
@@ -719,7 +722,7 @@ class apache2_plugin {
 
 		if(!is_dir($data['new']['document_root'].'/' . $web_folder)) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder);
 		if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/error') and $data['new']['errordocs']) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/error');
-		if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/stats');
+		if($data['new']['stats_type'] != '' && !is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/stats');
 		//if(!is_dir($data['new']['document_root'].'/'.$log_folder)) exec('mkdir -p '.$data['new']['document_root'].'/'.$log_folder);
 		if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
 		if(!is_dir($data['new']['document_root'].'/cgi-bin')) $app->system->mkdirpath($data['new']['document_root'].'/cgi-bin');
@@ -1005,8 +1008,10 @@ class apache2_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/web', $groupname);
 				$app->system->chown($data['new']['document_root'].'/web/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/web/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/web/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/web/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				}
 				$app->system->chown($data['new']['document_root'].'/webdav', $username);
 				$app->system->chgrp($data['new']['document_root'].'/webdav', $groupname);
 				$app->system->chown($data['new']['document_root'].'/private', $username);
@@ -1046,8 +1051,10 @@ class apache2_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/web', $groupname);
 				$app->system->chown($data['new']['document_root'].'/web/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/web/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/web/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/web/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				}
 				$app->system->chown($data['new']['document_root'].'/webdav', $username);
 				$app->system->chgrp($data['new']['document_root'].'/webdav', $groupname);
 			}
@@ -1060,16 +1067,20 @@ class apache2_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder, $groupname);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				}
 			} else {
 				$app->system->chmod($data['new']['document_root'].'/' . $web_folder, 0755);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder, $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder, $groupname);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				}
 			}
 		}
 
@@ -1152,6 +1163,7 @@ class apache2_plugin {
 		$vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
 		$vhost_data['has_custom_php_ini'] = $has_custom_php_ini;
 		$vhost_data['custom_php_ini_dir'] = escapeshellcmd($custom_php_ini_dir);
+		$vhost_data['logging'] = $web_config['logging'];
 
 		// Custom Apache directives
 		if(intval($data['new']['directive_snippets_id']) > 0){
@@ -1187,7 +1199,7 @@ class apache2_plugin {
 		$vhost_data['ssl_bundle_file'] = $bundle_file;
 
 		//* Generate Let's Encrypt SSL certificat
-		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
+		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && $conf['mirror_server_id'] == 0 && ( // ssl and let's encrypt is active and no mirror server
 			($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
 			|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
 			|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain
@@ -1215,6 +1227,17 @@ class apache2_plugin {
 
 		if(@is_file($bundle_file)) $vhost_data['has_bundle_cert'] = 1;
 
+		// HTTP/2.0 ?
+		$vhost_data['enable_http2']  = 'n';
+		if($vhost_data['enable_spdy'] == 'y'){
+			// check if apache supports http_v2
+			exec("2>&1 apachectl -M | grep http2_module", $tmp_output, $tmp_retval);
+			if($tmp_retval == 0){
+				$vhost_data['enable_http2']  = 'y';
+			}
+			unset($tmp_output, $tmp_retval);
+		}
+
 		// Set SEO Redirect
 		if($data['new']['seo_redirect'] != ''){
 			$vhost_data['seo_redirect_enabled'] = 1;
@@ -2205,7 +2228,7 @@ class apache2_plugin {
 		if($data['old']['type'] != 'vhost') $app->system->web_folder_protection($data['old']['document_root'], true);
 	}
 
-	//* This function is called when a IP on the server is inserted, updated or deleted
+	//* This function is called when a IP on the server is inserted, updated or deleted or when anon_ip setting is altered
 	function server_ip($event_name, $data) {
 		global $app, $conf;
 
@@ -2218,6 +2241,7 @@ class apache2_plugin {
 		$tpl = new tpl();
 		$tpl->newTemplate('apache_ispconfig.conf.master');
 		$tpl->setVar('apache_version', $app->system->getapacheversion());
+		$tpl->setVar('logging', $web_config['logging']);
 		$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
 		$records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ? AND virtualhost = 'y'", $conf['server_id']);
 
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index cf01df692d315540b7190779f289b04d728f1d14..88b5aa290cabb3c953b5a2e5ea10ceda14ecdcdc 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -169,7 +169,12 @@ class apps_vhost_plugin {
 			//$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content);
 			$content = str_replace('{fpm_socket}', $fpm_socket, $content);
 			$content = str_replace('{cgi_socket}', $cgi_socket, $content);
-			if(file_exists('/var/run/php5-fpm.sock') || file_exists('/var/run/php/php7.0-fpm.sock')){
+			if(	file_exists('/var/run/php5-fpm.sock')
+				|| file_exists('/var/run/php/php7.0-fpm.sock')
+				|| file_exists('/var/run/php/php7.1-fpm.sock')
+				|| file_exists('/var/run/php/php7.2-fpm.sock')
+				|| file_exists('/var/run/php/php7.3-fpm.sock')
+			){
 				$use_tcp = '#';
 				$use_socket = '';
 			} else {
diff --git a/server/plugins-available/mailman_plugin.inc.php b/server/plugins-available/mailman_plugin.inc.php
index 393f8a72e354f4f9c99bea98db102cf3136d7e4f..99ac9db7d23d8add4c1a0f5d94f447c265e282b9 100644
--- a/server/plugins-available/mailman_plugin.inc.php
+++ b/server/plugins-available/mailman_plugin.inc.php
@@ -89,6 +89,9 @@ class mailman_plugin {
 		if(is_file('/var/lib/mailman/data/transport-mailman')) exec('postmap /var/lib/mailman/data/transport-mailman');
 		
 		exec('nohup '.$conf['init_scripts'] . '/' . 'mailman reload >/dev/null 2>&1 &');
+		
+		// Fix list URL
+		exec('/usr/sbin/withlist -l -r fix_url '.escapeshellcmd($data["new"]["listname"]));
 
 		$app->db->query("UPDATE mail_mailinglist SET password = '' WHERE mailinglist_id = ?", $data["new"]['mailinglist_id']);
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index d54dcb5746e2ffcbfa91d198bcd48198c7671b93..aad984aac0d058eef67d88b8a7e8321a05cb76d3 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -106,7 +106,7 @@ class nginx_plugin {
 		if($data["new"]["type"] != "vhost" && $data["new"]["type"] != "vhostsubdomain" && $data["new"]["type"] != "vhostalias") return;
 
 		// if(!is_dir($data['new']['document_root'].'/ssl')) exec('mkdir -p '.$data['new']['document_root'].'/ssl');
-		if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
+		if(!is_dir($data['new']['document_root'].'/ssl') && !is_dir($data['old']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
 
 		$ssl_dir = $data['new']['document_root'].'/ssl';
 		$domain = ($data['new']['ssl_domain'] != '') ? $data['new']['ssl_domain'] : $data['new']['domain'];
@@ -566,7 +566,7 @@ class nginx_plugin {
 
 		if(!is_dir($data['new']['document_root'].'/' . $web_folder)) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder);
 		if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/error') and $data['new']['errordocs']) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/error');
-		if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/stats');
+		if($data['new']['stats_type'] != '' && !is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdirpath($data['new']['document_root'].'/' . $web_folder . '/stats');
 		//if(!is_dir($data['new']['document_root'].'/'.$log_folder)) exec('mkdir -p '.$data['new']['document_root'].'/'.$log_folder);
 		if(!is_dir($data['new']['document_root'].'/ssl')) $app->system->mkdirpath($data['new']['document_root'].'/ssl');
 		if(!is_dir($data['new']['document_root'].'/cgi-bin')) $app->system->mkdirpath($data['new']['document_root'].'/cgi-bin');
@@ -853,8 +853,10 @@ class nginx_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/web', $groupname);
 				$app->system->chown($data['new']['document_root'].'/web/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/web/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/web/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/web/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				}
 				//$app->system->chown($data['new']['document_root'].'/webdav',$username);
 				//$app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
 				$app->system->chown($data['new']['document_root'].'/private', $username);
@@ -900,8 +902,10 @@ class nginx_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/web', $groupname);
 				$app->system->chown($data['new']['document_root'].'/web/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/web/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/web/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/web/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/web/stats', $groupname);
+				}
 				//$app->system->chown($data['new']['document_root'].'/webdav',$username);
 				//$app->system->chgrp($data['new']['document_root'].'/webdav',$groupname);
 				
@@ -919,16 +923,20 @@ class nginx_plugin {
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder, $groupname);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				}
 			} else {
 				$app->system->chmod($data['new']['document_root'].'/' . $web_folder, 0755);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder, $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder, $groupname);
 				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/error', $username);
 				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/error', $groupname);
-				$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
-				$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				if($data['new']['stats_type'] != '') {
+					$app->system->chown($data['new']['document_root'].'/' . $web_folder . '/stats', $username);
+					$app->system->chgrp($data['new']['document_root'].'/' . $web_folder . '/stats', $groupname);
+				}
 			}
 		}
 
@@ -1158,6 +1166,16 @@ class nginx_plugin {
 
 		// Custom nginx directives
 		$final_nginx_directives = array();
+		if($data['new']['enable_pagespeed'] == 'y'){
+			// if PageSpeed is already enabled, don't add configuration again
+			if(stripos($nginx_directives, 'pagespeed') !== false){
+				$vhost_data['enable_pagespeed'] = false;
+			} else {
+				$vhost_data['enable_pagespeed'] = true;
+			}
+		} else {
+			$vhost_data['enable_pagespeed'] = false;
+		}
 		if(intval($data['new']['directive_snippets_id']) > 0){
 			$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'nginx' AND active = 'y' AND customer_viewable = 'y'", $data['new']['directive_snippets_id']);
 			if(isset($snippet['snippet'])){
@@ -1165,6 +1183,7 @@ class nginx_plugin {
 			} else {
 				$nginx_directives = $data['new']['nginx_directives'];
 			}
+/*
 			if($data['new']['enable_pagespeed'] == 'y'){
 				// if PageSpeed is already enabled, don't add configuration again
 				if(stripos($nginx_directives, 'pagespeed') !== false){
@@ -1175,9 +1194,10 @@ class nginx_plugin {
 			} else {
 				$vhost_data['enable_pagespeed'] = false;
 			}
+*/
 		} else {
 			$nginx_directives = $data['new']['nginx_directives'];
-			$vhost_data['enable_pagespeed'] = false;
+//			$vhost_data['enable_pagespeed'] = false;
 		}
 		
 		// folder_directive_snippets
@@ -1267,7 +1287,7 @@ class nginx_plugin {
 		$vhost_data['ssl_bundle_file'] = $bundle_file;
 
 		//* Generate Let's Encrypt SSL certificat
-		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
+		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && $conf['mirror_server_id'] == 0 && ( // ssl and let's encrypt is active and no mirror server
 			($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
 			|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
 			|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain
@@ -1513,6 +1533,9 @@ class nginx_plugin {
 			}
 			unset($tmp_output, $tmp_retval);
 		}
+		
+		// set logging variable
+		$vhost_data['logging'] = $web_config['logging'];
 
 		$tpl->setVar($vhost_data);
 
diff --git a/server/scripts/vlogger b/server/scripts/vlogger
index 5bc50f31833c2eb08e495c607c7a2cc473d25767..8703df0d77a58f667574e8f7deb4ea1e6253f6ba 100755
--- a/server/scripts/vlogger
+++ b/server/scripts/vlogger
@@ -28,7 +28,12 @@
 # 1.1   bugfix release
 # 1.2   support for mod_logio
 # 1.3	various contributed bugfixes
-# 1.3ISPconfig1 This local version has been modified for ISPConfig. Namely: "Added better error handling to vlogger script in case the MySQL database connection is not available."
+# 1.4   automatically creates two levels of subdirs.
+# 1.4p1 implemented anonymization of ipv4 and ipv6
+# 1.4p2 implemented anonymization in error log part
+# 1.4p3 implemented stronger anonymization
+# 1.4p4 implemented re-opening on externally rotated error.log
+# 1.4p5 backported old ISPConfig changes (improved DBI error handling, naming)
 #
 # 
 # TODO:
@@ -39,7 +44,7 @@ package vlogger;
 
 $ENV{PATH} = "/bin:/usr/bin";
 
-my $VERSION = "1.3";
+my $VERSION = "1.4p5"; # modified for ISPConfig
 
 =head1 NAME
 
@@ -109,6 +114,12 @@ or "%m%d%Y-error.log".  When using the -r option, the default becomes
 -d CONFIG
 	Use the DBI usage tracker.
 
+-p
+	Privacy mode (delete last octet of ipv4 or last 4 sections of ipv6)
+
+-P
+	Extended privacy mode (delete 2 octets ipv4 or 5 sections ipv6)
+
 -h
 	Displays help.
 
@@ -148,10 +159,12 @@ use sigtrap qw(handler exitall HUP USR1 TERM INT PIPE);
 use Date::Format;
 use Getopt::Std;
 use IO::Handle;
+use File::Path qw(make_path);
+use File::Basename;
 
 # get command line options
 our %OPTS;
-getopts( 'f:t:s:hu:g:aeivr:d:', \%OPTS );
+getopts( 'f:t:s:hu:g:aeinpPvr:d:', \%OPTS );
 
 # print out version
 if ( $OPTS{'v'} ) {
@@ -171,7 +184,7 @@ if ( $OPTS{'h'} || !$ARGV[0] ) {
 # log directory
 my $LOGDIR;
 if ( $ARGV[0] ) {
-    if ( !-d $ARGV[0] || -l $ARGV[0]) {
+    if ( !-d $ARGV[0] || -l $ARGV[0] ) {
         print STDERR
           "[vlogger] target directory $ARGV[0] does not exist or is a symlink - exiting.\n\n";
         exit;
@@ -253,13 +266,13 @@ if ( $OPTS{'d'} ) {
     }
 
     # test the connection
-	eval {
-      my $dbh = DBI->connect( $DBI_DSN, $DBI_USER, $DBI_PASS )
-        or die "DBI Error: $!";
-      $dbh->disconnect;
-	};
-	if ($@) {
-       print "MySQL Connection problem\n";
+    eval {
+        my $dbh = DBI->connect( $DBI_DSN, $DBI_USER, $DBI_PASS )
+          or die "DBI Error: $!";
+        $dbh->disconnect;
+    };
+    if($@) {
+        print "MySQL Connection problem\n";
     }
 
     # SIGALRM dumps the tracker hash
@@ -317,7 +330,7 @@ if ( $OPTS{'s'} ) {
 
 # chroot to the logdir
 chdir($LOGDIR);
-#chroot("."); we better do not chroot as DBI requires to load a module on the fly -> error!
+#chroot("."); #we better do not chroot as DBI requires to load a module on the fly -> error!
 
 my %logs     = ();
 my %tracker  = ();
@@ -367,6 +380,25 @@ if ( $OPTS{'e'} ) {
             $LASTWRITE = time();
         }
 
+#        my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+#            $atime,$mtime,$ctime,$blksize,$blocks)
+#               = stat(time2str( $TEMPLATE, time() ));
+        my @fstat = ELOG->stat();
+        my $nlinks = $fstat[3];
+        if($nlinks < 1) {
+			close ELOG;
+			open ELOG, ">>" . time2str( $TEMPLATE, time() )
+				or die ( "can't open $LOGDIR/" . time2str( $TEMPLATE, time() ) );
+		}
+
+        if ( $OPTS{'P'} ) {
+			$log_line =~ s/^(.*?\[client\s+\d+\.\d+)\.\d+\.\d+((?::\d+)?\]\s+.*)/$1.0.0$2/g;
+			$log_line =~ s/^(.*?\[client\s+[a-f0-9]*:[a-f0-9]*:[a-f0-9]*)(?::[a-f0-9]*){2,5}((?::\d+)?\]\s+.*)/$1::0$2/g;
+		} elsif ( $OPTS{'p'} ) {
+			$log_line =~ s/^(.*?\[client\s+\d+\.\d+\.\d+)\.\d+((?::\d+)?\]\s+.*)/$1.0$2/g;
+			$log_line =~ s/^(.*?\[client\s+[a-f0-9]*:[a-f0-9]*:[a-f0-9]*:[a-f0-9]*)(?::[a-f0-9]*){1,4}((?::\d+)?\]\s+.*)/$1::0$2/g;
+        }
+
         # we dont need to do any other parsing at all, so write the line.
         print ELOG $log_line;
     }
@@ -378,6 +410,15 @@ else {
     $0 = "vlogger (access log)";
     while ( my $log_line =  ) {
 
+        
+		if ( $OPTS{'P'} ) {
+			$log_line =~ s/^(\S*\s+\d+\.\d+)\.\d+\.\d+(\s+.*)/$1.0.0$2/g;
+			$log_line =~ s/^(\S*\s+[a-f0-9]*:[a-f0-9]*:[a-f0-9]*)(?::[a-f0-9]*){2,5}(\s+.*)/$1::0$2/g;
+		} elsif($OPTS{'p'}) {
+			$log_line =~ s/^(\S*\s+\d+\.\d+\.\d+)\.\d+(\s+.*)/$1.0$2/g;
+			$log_line =~ s/^(\S*\s+[a-f0-9]*:[a-f0-9]*:[a-f0-9]*:[a-f0-9]*)(?::[a-f0-9]*){1,4}(\s+.*)/$1::0$2/g;
+		}
+        
         # parse out the first word (the vhost)
         my @this_line = split ( /\s/, $log_line );
         my ($vhost) = $this_line[0];
@@ -386,7 +427,7 @@ else {
         if ( $vhost =~ m#[/\\]# ) { $vhost = "default" }
         $vhost =~ /(.*)/o;
         $vhost = $1;
-	$vhost = 'default' unless $vhost;
+        $vhost = 'default' unless $vhost;
 
         if ( $OPTS{'i'} ) {
             $reqsize = $this_line[1] + $this_line[2];
@@ -425,20 +466,24 @@ else {
                 delete( $logs{$key} );
             }
 
+            my $filename = "${vhost}/" . time2str( $TEMPLATE, time() );
+            my $filepath = dirname($filename);
+
             # check if directory is there
-            unless ( -d "${vhost}" ) {
-                mkdir("${vhost}");
+            unless ( -d $filepath ) {
+                print "mkdir: " . $filepath . "\n";
+                make_path($filepath)
+                  or die ( "can't mkdir $filepath" );
+            }
+            
+            # Dont log to symlinks
+            if( -l "${vhost}/".time2str( $TEMPLATE, time() ) ) {
+                die("Log target is a symlink: $LOGDIR/${vhost}/".time2str( $TEMPLATE, time() ));
             }
-			
-			# Dont log to symlinks
-			if( -l "${vhost}/".time2str( $TEMPLATE, time() ) ) {
-				die("Log target is a symlink: $LOGDIR/${vhost}/".time2str( $TEMPLATE, time() ));
-			}
 
             # open the file using the template
-            open $vhost, ">>${vhost}/" . time2str( $TEMPLATE, time() )
-              or die ( "can't open $LOGDIR/${vhost}/"
-                . time2str( $TEMPLATE, time() ) );
+            open $vhost, ">>".$filename
+              or die ( "can't open $filename" );
 
             # autoflush the handle unless -a
             if ( !$OPTS{'a'} ) {
@@ -465,9 +510,11 @@ else {
             $log_line =~ s/^\S*\s+//o;
         }
 
-        if ( $reqsize =~ m/^\d*$/ && $reqsize > 0 ) {
-            $tracker{$vhost} += $reqsize;
-        }
+        if ($reqsize ne "-") {
+			  if ( $reqsize =~ m/\d|/ && $reqsize > 0 ) {
+   	         $tracker{$vhost} += $reqsize;
+      	  }
+		  }
 
         print $vhost $log_line;
 
@@ -515,7 +562,7 @@ sub open_errorlog {
 # sub to update the database with the tracker data
 sub dump_tracker {
     eval {
-	if ( keys(%tracker) > 0 ) {
+    if ( keys(%tracker) > 0 ) {
         my $dbh = DBI->connect( $DBI_DSN, $DBI_USER, $DBI_PASS )
           or warn "DBI Error: $!";
         foreach my $key ( keys(%tracker) ) {
@@ -541,7 +588,8 @@ sub dump_tracker {
         %tracker = ();
     }
     alarm $DBI_DUMP;
-	};
+    };
+    
     if ($@) {
         print "Unable to store vlogger data in database\n";
     }
@@ -562,6 +610,10 @@ sub usage {
     print "  -s SYMLINK                  maintain a symlink to most recent file\n";
     print "  -r SIZE                     rotate when file reaches SIZE\n";
     print "  -d CONFIG                   use DBI usage tracker (see perldoc vlogger)\n";
+    print "  -p                          Privacy mode (delete last octet of ipv4 or\n";
+    print "                              last 4 sections of ipv6)\n";
+    print "  -P                         Extended privacy mode (delete 2 octets ipv4\n";
+    print "                              or last 5 sections of ipv6\n";
     print "  -i                          extract mod_logio instead of filesize\n";
     print "  -h                          display this help\n";
     print "  -v                          output version information\n\n";