diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 8a1dcd465c809b39b06ebb8fcb235b84cfd27e78..10cfbaf9654bb5f8e31652069f5a01eb97a7dbc3 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2135,9 +2135,9 @@ class installer_base { $content = str_replace('{ssl_comment}', '#', $content); // Fix socket path on PHP 7 systems - if(file_exists('/var/run/php/php7.0-fpm.sock')) { - $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content); - } + if(file_exists('/var/run/php/php7.0-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content); + if(file_exists('/var/run/php/php7.1-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.1-fpm.sock', $content); + if(file_exists('/var/run/php/php7.2-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.2-fpm.sock', $content); wf($vhost_conf_dir.'/apps.vhost', $content); diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 948d4e81ff2461fb9fb67393e21d1a383ea1fce6..ee6e534b21ca2fc8a36118204587f8690a267af6 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -75,16 +75,17 @@ class db { $this->dbNewLink = $conf[$prefix.'db_new_link']; $this->dbClientFlags = $conf[$prefix.'db_client_flags']; - $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort); + $this->_iConnId = mysqli_init(); + $this->_iConnId->real_connect($this->dbHost, $this->dbUser, $this->dbPass, null, (int)$this->dbPort, null, $this->dbClientFlags); $try = 0; - while((!is_object($this->_iConnId) || mysqli_connect_error()) && $try < 5) { + while($this->_iConnId->connect_error && $try < 5) { if($try > 0) sleep(1); $try++; - $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort); + $this->_iConnId->real_connect($this->dbHost, $this->dbUser, $this->dbPass, null, (int)$this->dbPort, null, $this->dbClientFlags); } - if(!is_object($this->_iConnId) || mysqli_connect_error()) { + if($this->_iConnId->connect_error) { $this->_iConnId = null; $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!'); return false; diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 0f313de6bded35da1314350a971861a9609f276c..a5a5d0c31c49c647f33d5a0eca3310133820e05c 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -308,7 +308,9 @@ class remoting_lib extends tform_base { global $app; $username = $params["username"]; $clear_password = $params["password"]; + $language = $params['language']; $client_id = $app->functions->intval($client_id); + if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($clear_password)); else $password = $clear_password; $params = array($username); @@ -318,8 +320,15 @@ class remoting_lib extends tform_base { } else { $pwstring ="" ; } + + $langstring = ''; + if (!empty($language)) { + $langstring = ', language = ?'; + $params[] = $language; + } + $params[] = $client_id; - $sql = "UPDATE sys_user set username = ? $pwstring WHERE client_id = ?"; + $sql = "UPDATE sys_user set username = ? $pwstring $langstring WHERE client_id = ?"; $app->db->query($sql, true, $params); } diff --git a/interface/web/admin/server_config_edit.php b/interface/web/admin/server_config_edit.php index 4c03e7ee431ef77f8358bfee0b98d1b59048f49b..e446bf3adde88b8b46ddef61e7f6f6df90916108 100644 --- a/interface/web/admin/server_config_edit.php +++ b/interface/web/admin/server_config_edit.php @@ -72,6 +72,14 @@ class page_action extends tform_actions { $app->tpl->setVar($record); } + function onShowEnd() { + global $app; + + $app->tpl->setVar('server_name', $app->functions->htmlentities($app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ? AND ((SELECT COUNT(*) FROM server) > 1)", $this->id)['server_name'])); + + parent::onShowEnd(); + } + function onUpdateSave($sql) { global $app, $conf; diff --git a/interface/web/admin/templates/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm index 908e6246b2d5abeffd864d2f5242d34bab3bd0c8..62e6efea76bc85d734cf1d214c38b40f4e22a80d 100644 --- a/interface/web/admin/templates/server_config_cron_edit.htm +++ b/interface/web/admin/templates/server_config_cron_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -21,4 +21,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm index b2b79665748f8f0d7815a33333123fb7dc8ab499..a4f7a26adef5ebe754dde5c9afe1fa95376ced93 100644 --- a/interface/web/admin/templates/server_config_dns_edit.htm +++ b/interface/web/admin/templates/server_config_dns_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm index b4c5cac19eb79b9f93c6103e1d45d30b87ef5344..c36b482e725b69399afc657065c3b0ade563ca02 100644 --- a/interface/web/admin/templates/server_config_fastcgi_edit.htm +++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -39,4 +39,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm index 406dff412d5e04ee5938c8373411d50385d76278..84ca1ec73ffbac9a7f4901a2e75a39d220eabb2c 100644 --- a/interface/web/admin/templates/server_config_getmail_edit.htm +++ b/interface/web/admin/templates/server_config_getmail_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -15,4 +15,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm index 3371fd8a30063ac6b3aa6c29d54059564e3a29cb..b7a749147654c6fab6105400cafb7ec691d980c8 100644 --- a/interface/web/admin/templates/server_config_jailkit_edit.htm +++ b/interface/web/admin/templates/server_config_jailkit_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -24,4 +24,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 926be8e62c97f43738f4c167de3e9182e6a7a998..c1531c654a18b1a430bb1a856600667d4fdeab58 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm index 435449bf2413729d048abdf6bb8aaecab9c914c2..df8aa97c0714ce4e5ac94a73e978c8a2e71d1f03 100644 --- a/interface/web/admin/templates/server_config_rescue_edit.htm +++ b/interface/web/admin/templates/server_config_rescue_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index be44a85551f97e0d4fadba1e21bbf960db506335..66ead08996f49b6cea69ce5762563b26d27a05f2 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm index e84260bc7aabf0868fc979e0f00bae5bac3bec72..85e9c782973dc69cc465323d4ac2d6e22440374d 100644 --- a/interface/web/admin/templates/server_config_ufw_edit.htm +++ b/interface/web/admin/templates/server_config_ufw_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -60,4 +60,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm index edcbaeda84dc1304c81a7e16f4243dc950d54d55..a53ab7667682a6942b3733525f87929c33a17749 100644 --- a/interface/web/admin/templates/server_config_vlogger_edit.htm +++ b/interface/web/admin/templates/server_config_vlogger_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

@@ -15,4 +15,4 @@
-
\ No newline at end of file + diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index c1bae44c06f042850131ebe915062840ad7c7bad..c0f148271cfea33ef49f46e80db568905216a7f5 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/admin/templates/server_config_xmpp_edit.htm b/interface/web/admin/templates/server_config_xmpp_edit.htm index acf019b9ff9910a4fd99af6e86731ebb8cf3e2d0..4e6eaf0018a21b52ea4c84eb55ed85c4dcc42732 100644 --- a/interface/web/admin/templates/server_config_xmpp_edit.htm +++ b/interface/web/admin/templates/server_config_xmpp_edit.htm @@ -1,5 +1,5 @@
-

+

{tmpl_var name='server_name'}

diff --git a/interface/web/mail/form/mail_transport.tform.php b/interface/web/mail/form/mail_transport.tform.php index ee3c52b447d311cf742977a6d558b7754c042a7e..f55541346ce171beba72964a13499e4a248c3722 100644 --- a/interface/web/mail/form/mail_transport.tform.php +++ b/interface/web/mail/form/mail_transport.tform.php @@ -68,7 +68,7 @@ $form["tabs"]['transport'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND mail_server = 1 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index 7b7f7415981b8d8559e661149789531822a86a81..e00287a8e75da8aade3675ae8ff9b6d0100092cb 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -65,6 +65,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.
We cant find any of them at your server.

This means we can not support your RAID yet.'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'State'; $wb['monitor_serverstate_unknown_txt'] = 'unknown'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index 526646bb5fbf157e88ccb5b2da0e122161cb4143..0db4623d03fc374f1f6388ef5c4aac55c4912054 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Сървър'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Статус'; $wb['monitor_serverstate_unknown_txt'] = 'неизвестно'; $wb['monitor_serverstate_info_txt'] = 'инфо'; diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index e2a490e466908c8e0799741b59b2d984310a58d5..048fec64be5cbfac4bbcd8175b298cc5bf792552 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Log do clamav '; $wb['monitor_logs_ispc_txt'] = 'Log do ispconfig'; $wb['monitor_norkhunter_txt'] = 'RKHunter não está instalado, então não existem logs a exibir'; $wb['monitor_serverstate_server_txt'] = 'Servidor'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Estado'; $wb['monitor_serverstate_unknown_txt'] = 'desconhecido(s)'; $wb['monitor_serverstate_info_txt'] = 'informação(es)'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index 29859cfae4a56e5e1b70ff9bad1bdccabe64e96f..4575be2ff1f54a8584363c49e8e1e869157d197c 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -68,6 +68,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.
Aucun des deux n\'a été trouvé sur votre serveur.

Nous ne supportons donc pas votre RAID.'; $wb['monitor_norkhunter_txt'] = 'RKHunter nest pas installé, il ny a donc pas de logs'; $wb['monitor_serverstate_server_txt'] = 'Serveur'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Etat'; $wb['monitor_serverstate_unknown_txt'] = 'inconnu'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index a4e670df63693505fae2f8b4873fe9e41935bb4d..dc3e3cb341781ce68ca9e5076e3cb4f43de27f22 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter není nainstalován, proto zde nejsou žádna data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Stav'; $wb['monitor_serverstate_unknown_txt'] = 'neznámý'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 6a342be1ea40aca529d0cceafe2f3c90c0532178..78954daee6761d4273c27dac4dfa7e151a45e7db 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'ClamAV Protokoll'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig Protokoll'; $wb['monitor_norkhunter_txt'] = 'RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Status'; $wb['monitor_serverstate_unknown_txt'] = 'unbekannt'; $wb['monitor_serverstate_info_txt'] = 'Info'; diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index da8aa1122ce0ca075c5731ffc89b7d38e608270b..dc43c1306fcbf486e6e2462142848ee8ff2e9049 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -68,6 +68,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nosupportedraid1_txt'] = 'I øjeblikket støtter vi \'mdadm\' eller \'mpt-status\' til overvågning af RAID.
Vi kan ikke finde nogen af dem på din server.

Det betyder, at vi ikke kan støtte din RAID endnu.'; $wb['monitor_norkhunter_txt'] = 'RKHunter er ikke installeret, så der er ingen log data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Status'; $wb['monitor_serverstate_unknown_txt'] = 'ukendt'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 1df16520473b3f1ead768bf7b3d67e8731df365f..414642e2e359fa1fe4c3b3ad416691d569e4169f 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -65,6 +65,7 @@ $wb['monitor_logs_ispc_txt'] = 'Αρχείο καταγραφής ISPConfig'; $wb['monitor_nosupportedraid1_txt'] = 'Προς το παρόν υποστηρίζουμε mdadm ή mpt-status για την εποπτεία του RAID.
Δεν μπορούμε να βρούμε κάποιο από αυτά στον server σας.

Αυτό σημαίνει ότι δεν μπορούμε να υποστηρίξουμε το RAID σας ακόμη.'; $wb['monitor_norkhunter_txt'] = 'Το RKHunter δεν είναι εγκατεστημένο, οπότε δεν υπάρχουν δεδομένα'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Κατάσταση'; $wb['monitor_serverstate_unknown_txt'] = 'άγνωστη'; $wb['monitor_serverstate_info_txt'] = 'πληροφορία'; diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index aa6472e580038b537920d750a8db1cb3285de5f8..f4dbbeff9bc4d879ba293249c19f715c69953034 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -74,6 +74,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nosupportedraid1_txt'] = "At the moment, we support 'mdadm' or 'mpt-status' for monitoring the RAID.
We can't find any of them at your server.

This means we can not support your RAID yet."; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'State'; $wb['monitor_serverstate_unknown_txt'] = 'unknown'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 023a2ea0e4d43e071ff8a15d3841149f85e9924e..8cc87b4801809002201cb6f6e9b929a59edf86d9 100755 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -74,6 +74,7 @@ $wb['monitor_serverstate_server_txt'] = 'Servidor'; $wb['monitor_serverstate_servicesoffline_txt'] = 'Uno o más servicios necesarios no están funcionando'; $wb['monitor_serverstate_servicesonline_txt'] = 'Todos los servicios necesarios están funcionando'; $wb['monitor_serverstate_servicesunknown_txt'] = 'Servicios: ¿?'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Estado'; $wb['monitor_serverstate_syslogerror_txt'] = 'Hay errores en su registro del sistema'; $wb['monitor_serverstate_syslogok_txt'] = 'El registro del sistema está bien'; diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index 73653e84b7f0170c9c30103018f7a6c84c997a38..44143f3d207ced3c6086a8f6a90a65a1b1508b59 100755 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav-päivitysloki'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig-pääloki'; $wb['monitor_norkhunter_txt'] = 'RKHunter ei ole asennettuna, joten siitä ei ole tulostietoja.'; $wb['monitor_serverstate_server_txt'] = 'Palvelin'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Tila'; $wb['monitor_serverstate_unknown_txt'] = 'tuntematonta'; $wb['monitor_serverstate_info_txt'] = 'viestiä'; diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 49d118f34d8564a1427c04372fa2697885a5551a..9fb2ab5e8c41de82de381d5724b97bcd067c82c1 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -68,6 +68,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.
Aucun des deux n’a été trouvé sur votre serveur.

Nous ne supportons donc pas votre RAID.'; $wb['monitor_norkhunter_txt'] = 'RKHunter nest pas installé, il ny a donc pas de logs'; $wb['monitor_serverstate_server_txt'] = 'Serveur'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Etat'; $wb['monitor_serverstate_unknown_txt'] = 'inconnu'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index 923b68d006a8a74b5344155c093aa0e62958c8ad..d878568104d37fd8c9700d1c1d3f09325bca0db6 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -65,6 +65,7 @@ $wb['monitor_logs_ispc_txt'] = 'Control panel log-ovi'; $wb['monitor_nosupportedraid1_txt'] = 'Trenutno je podržan samo mdadm ili mpt-status za nadzor RAID-a.
Ne možemo pronaći niti jedan na vašem serveru.

To znači da ne možemo podržati vaš RAID.'; $wb['monitor_norkhunter_txt'] = 'RKHunter nije instaliran, stoga nema log podataka.'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Stanje'; $wb['monitor_serverstate_unknown_txt'] = 'nepoznatih'; $wb['monitor_serverstate_info_txt'] = 'informacija'; diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index acf7b40b402288a0436b410d54027b4ac9f2b078..85fda979087b48f424ea1f3d828b90a3bebfb781 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Szerver'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Státusz'; $wb['monitor_serverstate_unknown_txt'] = 'ismeretlen'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index ffb5a79c33ced2ddc40faff056b421dcdea3bfc6..d77f1456496bc650db3e2ff4c6ebaf554d574d53 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Log - ClamAV'; $wb['monitor_logs_ispc_txt'] = 'Log - ISPConfig'; $wb['monitor_norkhunter_txt'] = 'RKHunter tidak terpasang, hingga tidak ada data log'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Kondisi'; $wb['monitor_serverstate_unknown_txt'] = 'tak diketahui'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index 47d9c4da026f799db33041b8c3c4c61ac769b354..c7a6823683d4c32d2ce8f92e257317ccd0f9eb25 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter non è installato, non sono disponibili dati nel log '; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Stato'; $wb['monitor_serverstate_unknown_txt'] = 'sconosciuto'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 22d3b272eb61e5fb5ac9684f73e707708d276227..bc2c7d2b5c2cf2fb5068934db32e3c428a1ac251 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - ログ'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - ログ'; $wb['monitor_norkhunter_txt'] = 'RKHunterがインストールされていないため、データが存在しません。'; $wb['monitor_serverstate_server_txt'] = 'サーバー'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = '状態'; $wb['monitor_serverstate_unknown_txt'] = '不明'; $wb['monitor_serverstate_info_txt'] = '情報'; diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 760803a5d538f3d0e28ca4dc0a3a0759030e73b2..81caa02b704a990f6b3c72c5b2a39577d5a05ad1 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter is niet geïnstalleerd. Hierdoor is er geen informatie beschikbaar.'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'status'; $wb['monitor_serverstate_unknown_txt'] = 'onbekend'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 4ce642fbd8ba36e922bb1fe25add725cf9391764..77d05e0569e66a0154103a505e72a84ab8296f4c 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Log Clamav'; $wb['monitor_logs_ispc_txt'] = 'Log ISPConfig'; $wb['monitor_norkhunter_txt'] = 'RKHunter nie jest zainstalowany, więc nie ma Log-u'; $wb['monitor_serverstate_server_txt'] = 'Serwer'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Status'; $wb['monitor_serverstate_unknown_txt'] = 'nieznany'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 6ad8038b95438c95625a6f3bf891d826e8608d29..2218ede892b5a89f327d54cc49f61bcc38791587 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Log do Clamav '; $wb['monitor_logs_ispc_txt'] = 'Log do ISPConfig'; $wb['monitor_norkhunter_txt'] = 'RKHunter não está instalado, então não existem logs a exibir'; $wb['monitor_serverstate_server_txt'] = 'Servidor'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Estado'; $wb['monitor_serverstate_unknown_txt'] = 'desconhecido'; $wb['monitor_serverstate_info_txt'] = 'informações'; diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 85063a047d6cf74c6c07b0d40a7499b69681666e..7b06c4ba0c37b9b65d1c39b85d8230979babdac5 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'State'; $wb['monitor_serverstate_unknown_txt'] = 'unknown'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index cbabab99ed0a537085fe35854d259d47a4c320f5..49e9d4604d6cd1bb8a8c525c6b41c537f2da6ed8 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - журнал'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - журнал'; $wb['monitor_norkhunter_txt'] = 'RKHunter не установлен, поэтому нет логов'; $wb['monitor_serverstate_server_txt'] = 'Сервер'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Состояние'; $wb['monitor_serverstate_unknown_txt'] = 'неизвестных'; $wb['monitor_serverstate_info_txt'] = 'информации'; diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 4d3e8d7277fce0a319b04301a5145b32dc5d48d3..732805d2a633d2c37ff15be6ef40ee2d424853b7 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - logg'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - logg'; $wb['monitor_norkhunter_txt'] = 'RKHunter är inte installerat så det finns ingen loggdata'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Status'; $wb['monitor_serverstate_unknown_txt'] = 'okänd'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index c74508a1ff11acfb2538fedab0b15ff9f9643c25..7697242386a4cd279ae2f0b5be354d6e1e5b421b 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -64,6 +64,7 @@ $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; $wb['monitor_serverstate_server_txt'] = 'Server'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'State'; $wb['monitor_serverstate_unknown_txt'] = 'unknown'; $wb['monitor_serverstate_info_txt'] = 'info'; diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 091b95900f9ac6c51459ae8693bdda6b6fd85a1e..00beedb1dc2d54f704d0cb848a0ddee746ce332d 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -68,6 +68,7 @@ $wb['monitor_logs_ispc_txt'] = 'ISPConfig Günlüğü'; $wb['monitor_nosupportedraid1_txt'] = 'Şimdilik RAID durumunu izlemek için mdadm ya da mpt-status destekleniyor.
Bunlardan biri sunucunuzda bulunamadı.

Bu nedenle RAID sürücünüz henüz desteklenemiyor.'; $wb['monitor_norkhunter_txt'] = 'RKHunter yüklü olmadığından herhangi bir günlük verisi yok'; $wb['monitor_serverstate_server_txt'] = 'Sunucu'; +$wb['monitor_serverstate_kernel_txt'] = 'Kernel'; $wb['monitor_serverstate_state_txt'] = 'Durum'; $wb['monitor_serverstate_unknown_txt'] = 'bilinmiyor'; $wb['monitor_serverstate_info_txt'] = 'bilgi'; diff --git a/interface/web/tools/import_ispconfig.php b/interface/web/tools/import_ispconfig.php index 0e7763dd98d15a79f660e0ade9f03b89f3a4b9bf..4012802bc78065c133a76427e451cd5b99f3318a 100644 --- a/interface/web/tools/import_ispconfig.php +++ b/interface/web/tools/import_ispconfig.php @@ -109,10 +109,22 @@ if(isset($_POST['connected'])) { try { + //* Allow connections to self signed SSL certs + $context = stream_context_create( + array( + 'ssl' => array ( + 'verify_peer' => false, + 'verify_peer_name' => false, + 'allow_self_signed' => true + ) + ) + ); + $client = new SoapClient(null, array('location' => $_POST['remote_server'], 'uri' => $_POST['remote_server'].'/index.php', 'trace' => 1, - 'exceptions' => 1)); + 'exceptions' => 1, + 'stream_context' => $context)); if(!isset($remote_session_id)) $remote_session_id = $_POST['remote_session_id']; diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php index 7e3e9b4da2f55410659ab6e92d8ca166dde5d2d8..e5958c064e388827fda93cee6617d28911b02e1e 100644 --- a/interface/web/tools/resync.php +++ b/interface/web/tools/resync.php @@ -74,8 +74,8 @@ class page_action extends tform_actions { //* check the database for existing records $server_data = $this->server_has_data($server_type, $server['server_id']); foreach ($search as $needle) -// if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) { - if (in_array($needle, $server_data)) { + if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) { +// if (in_array($needle, $server_data)) { $options_servers .= ""; $server_count++; } @@ -525,7 +525,7 @@ class page_action extends tform_actions { $this->dataRecord['db_server_id'] = $this->dataRecord['all_server_id']; $this->dataRecord['mail_server_id'] = $this->dataRecord['all_server_id']; $this->dataRecord['mailbox_server_id'] = $this->dataRecord['all_server_id']; - $this->dataRecord['verserver_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['vserver_server_id'] = $this->dataRecord['all_server_id']; $this->dataRecord['dns_server_id'] = $this->dataRecord['all_server_id']; } @@ -596,7 +596,7 @@ class page_action extends tform_actions { //* 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']); + $msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['vserver_server_id'], 'hostname', $app->tform->wordbook['do_vserver_txt']); //* dns if($this->dataRecord['resync_dns'] == 1) { diff --git a/security/ids.whitelist b/security/ids.whitelist index 42c0559ecbd118bb94d5ae41de65b73a627789e2..a9b045e15f52b2bb8d4d6d6d0d09b92bd3319d73 100644 --- a/security/ids.whitelist +++ b/security/ids.whitelist @@ -41,6 +41,7 @@ admin:/capp.php:SESSION.s.module.nav.1.items.0.title admin:/sites/web_vhost_subdomain_edit.php:POST.php_open_basedir admin:/sites/web_domain_edit.php:POST.php_open_basedir admin:/sites/web_domain_edit.php:POST.apache_directives +admin:/sites/web_vhost_domain_edit.php:POST.nginx_directives user:/sites/shell_user_edit.php:POST.ssh_rsa user:/sites/cron_edit.php:POST.command admin:/admin/server_config_edit.php:POST.jailkit_chroot_app_programs diff --git a/server/lib/classes/cron.d/100-monitor_kernel_version.inc.php b/server/lib/classes/cron.d/100-monitor_kernel_version.inc.php new file mode 100644 index 0000000000000000000000000000000000000000..6ead20bdd8064b2bad4db4434c42ff7f7c28e5f3 --- /dev/null +++ b/server/lib/classes/cron.d/100-monitor_kernel_version.inc.php @@ -0,0 +1,107 @@ +load('monitor_tools'); + $this->_tools = new monitor_tools(); + /* end global section for monitor cronjobs */ + + /* the id of the server as int */ + $server_id = intval($conf['server_id']); + + /** The type of the data */ + + $type = 'kernel_info'; + + /* + Fetch the data into a array + */ + $kernel = shell_exec("uname -mrs"); + + $data['name'] = ''; + $data['version'] = $kernel; + + /* the OS has no state. It is, what it is */ + $state = 'no_state'; + + $res = array(); + $res['server_id'] = $server_id; + $res['type'] = $type; + $res['data'] = $data; + $res['state'] = $state; + + /* + * Insert the data into the database + */ + $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' . + 'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)'; + $app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']); + + /* The new data is written, now we can delete the old one */ + $this->_tools->delOldRecords($res['type'], $res['server_id']); + + parent::onRunJob(); + } + + /* this function is optional if it contains no custom code */ + public function onAfterRun() { + global $app; + + parent::onAfterRun(); + } + +} + +?> diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php index 40778a8a13abcb96888b2eaf868bf97578fa9e15..6f38f0b403d66dee84f581dad70ed70e5bf21a5d 100644 --- a/server/lib/classes/cron.d/200-logfiles.inc.php +++ b/server/lib/classes/cron.d/200-logfiles.inc.php @@ -150,8 +150,8 @@ class cronjob_logfiles extends cronjob { $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'); + while($num >= 1) { + if(is_file($error_logfile . '.' . $num . '.gz')) rename($error_logfile . '.' . $num . '.gz', $error_logfile . '.' . ($num + 1) . '.gz'); $num--; } // compress current logfile diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 424867f095840e4da8862adfaff7a70a6aa782da..21e9dc9aa5dbac80707c78baddeeec34850612e6 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -76,16 +76,17 @@ class db $this->dbNewLink = $conf['db_new_link']; $this->dbClientFlags = $conf['db_client_flags']; - $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort); + $this->_iConnId = mysqli_init(); + $this->_iConnId->real_connect($this->dbHost, $this->dbUser, $this->dbPass, null, (int)$this->dbPort, null, $this->dbClientFlags); $try = 0; - while((!is_object($this->_iConnId) || mysqli_connect_error()) && $try < 5) { + while($this->_iConnId->connect_error && $try < 5) { if($try > 0) sleep(1); $try++; - $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass, '', (int)$this->dbPort); + $this->_iConnId->real_connect($this->dbHost, $this->dbUser, $this->dbPass, null, (int)$this->dbPort, null, $this->dbClientFlags); } - if(!is_object($this->_iConnId) || mysqli_connect_error()) { + if($this->_iConnId->connect_error) { $this->_iConnId = null; $this->_sqlerror('Zugriff auf Datenbankserver fehlgeschlagen! / Database server not accessible!', '', true); return false; diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php index 88b5aa290cabb3c953b5a2e5ea10ceda14ecdcdc..b843e3c8a4e45f86adedf8106207d79e1c4b586f 100644 --- a/server/plugins-available/apps_vhost_plugin.inc.php +++ b/server/plugins-available/apps_vhost_plugin.inc.php @@ -183,6 +183,11 @@ class apps_vhost_plugin { } $content = str_replace('{use_tcp}', $use_tcp, $content); $content = str_replace('{use_socket}', $use_socket, $content); + + // Fix socket path on PHP 7 systems + if(file_exists('/var/run/php/php7.0-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content); + if(file_exists('/var/run/php/php7.1-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.1-fpm.sock', $content); + if(file_exists('/var/run/php/php7.2-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.2-fpm.sock', $content); // PHP-FPM // Dont just copy over the php-fpm pool template but add some custom settings