Commit 09a9ecbb authored by Marius Burkard's avatar Marius Burkard

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 840f3954 b1cfd5bb
......@@ -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);
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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;
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -21,4 +21,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -39,4 +39,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -15,4 +15,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -24,4 +24,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -60,4 +60,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......@@ -15,4 +15,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
</div></div>
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"></h1>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
......
......@@ -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'
),
......
......@@ -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.<br>We cant find any of them at your server.<br><br>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';
......
......@@ -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'] = 'инфо';
......
......@@ -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)';
......
......@@ -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.<br>Aucun des deux n\'a été trouvé sur votre serveur.<br><br>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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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.<br>Vi kan ikke finde nogen af dem på din server.<br><br>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';
......
......@@ -65,6 +65,7 @@ $wb['monitor_logs_ispc_txt'] = 'Αρχείο καταγραφής ISPConfig';
$wb['monitor_nosupportedraid1_txt'] = 'Προς το παρόν υποστηρίζουμε mdadm ή mpt-status για την εποπτεία του RAID.<br>Δεν μπορούμε να βρούμε κάποιο από αυτά στον server σας.<br><br>Αυτό σημαίνει ότι δεν μπορούμε να υποστηρίξουμε το 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'] = 'πληροφορία';
......
......@@ -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.<br>We can't find any of them at your server.<br><br>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';
......
......@@ -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';
......
......@@ -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ä';
......
......@@ -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.<br>Aucun des deux n’a été trouvé sur votre serveur.<br><br>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';
......
......@@ -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.<br>Ne možemo pronaći niti jedan na vašem serveru.<br><br>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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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'] = '情報';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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'] = 'информации';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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.<br>Bunlardan biri sunucunuzda bulunamadı.<br><br>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';
......
......@@ -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'];
......
......@@ -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 .= "<option value='$server[server_id]'>$server[server_name]</option>";
$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) {
......
......@@ -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
......
<?php
/*
Copyright (c) 2013, Marius Cramer, pixcept KG, Hj Ahmad Rasyid Hj Ismail "ahrasis"
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class cronjob_monitor_kernel_version extends cronjob {
// job schedule
protected $_schedule = '*/5 * * * *';
protected $_run_at_new = true;
private $_tools = null;
/* this function is optional if it contains no custom code */
public function onPrepare() {
global $app;
parent::onPrepare();
}
/* this function is optional if it contains no custom code */
public function onBeforeRun() {
global $app;
return parent::onBeforeRun();
}
public function onRunJob() {
global $app, $conf;
/* used for all monitor cronjobs */
$app->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();
}
}