From cbda30058c0f61ae2afbd9085afcf841f32751a5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 11:50:52 -0500
Subject: [PATCH] Fixed: FS#431 - jailkit users cannot login
---
interface/web/monitor/tools.inc.php | 113 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 36 deletions(-)
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 0348461..0800758 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -89,12 +89,13 @@
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>
<tr>
- <td>Filesystem</td>
- <td>1K-blocks</td>
- <td>Used</td>
- <td>Available</td>
- <td>Use%</td>
- <td>Mounted on</td>
+ <td>'.$app->lng("monitor_diskusage_filesystem_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_type_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_size_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_used_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_available_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_usage_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_mounted_txt").'</td>
</tr>';
foreach($data as $line) {
$html .= '<tr>';
@@ -204,12 +205,12 @@
if($data['webserver'] != -1) {
if($data['webserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>Web-Server:</td>
+ <td>'.$app->lng("monitor_services_web_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
@@ -217,72 +218,72 @@
if($data['ftpserver'] != -1) {
if($data['ftpserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>FTP-Server:</td>
+ <td>'.$app->lng("monitor_services_ftp_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['smtpserver'] != -1) {
if($data['smtpserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>SMTP-Server:</td>
+ <td>'.$app->lng("monitor_services_smtp_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['pop3server'] != -1) {
if($data['pop3server'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>POP3-Server:</td>
+ <td>'.$app->lng("monitor_services_pop_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['imapserver'] != -1) {
if($data['imapserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>IMAP-Server:</td>
+ <td>'.$app->lng("monitor_services_imap_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['bindserver'] != -1) {
if($data['bindserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>DNS-Server:</td>
+ <td>'.$app->lng("monitor_services_mydns_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['mysqlserver'] != -1) {
if($data['mysqlserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>mySQL-Server:</td>
+ <td>'.$app->lng("monitor_services_mysql_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
@@ -313,7 +314,7 @@
* If not (because the destribution is not supported) show this.
*/
if ($record['state'] == 'no_state'){
- $html .= "Your distribution is not supported for this monitoring";
+ $html .= '<p>'.$app->lng("monitor_updates_nosupport_txt").'</p>';
}
else {
$data = unserialize($record['data']);
@@ -321,7 +322,7 @@
}
$html .= '</div></div>';
} else {
- $html = '<p>' . "No Update-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_updates_txt").'</p>';
}
return $html;
@@ -344,7 +345,7 @@
* If not (because the destribution is not supported) show this.
*/
if ($record['state'] == 'no_state'){
- $html .= '<p>' . "mdadm ist not installed or your Server has no supported RAID" . '</p>';
+ $html .= '<p>'.$app->lng("monitor_nomdadm_txt").'</p>';
}
else {
$data = unserialize($record['data']);
@@ -353,7 +354,7 @@
$html .= '</div></div>';
} else {
- $html = '<p>' . "No RAID-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_raid_txt").'</p>';
}
return $html;
@@ -373,11 +374,11 @@
/*
* First, we have to detect, if there is any monitoring-data.
- * If not (because the destribution is not supported) show this.
+ * If not (because rkhunter is not installed) show this.
*/
$data = unserialize($record['data']);
if ($data['output'] == ''){
- $html .= '<p>' . "rkhunter ist not installed, so there is no log data" . '</p>';
+ $html .= '<p>'.$app->lng("monitor_norkhunter_txt").'</p>';
}
else {
$html .= nl2br($data['output']);
@@ -385,11 +386,47 @@
$html .= '</div></div>';
} else {
- $html = '<p>' . "No RKHunter-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_rkhunter_txt").'</p>';
}
return $html;
}
+
+function showFail2ban()
+{
+ global $app;
+
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_fail2ban' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
+
+ /*
+ * First, we have to detect, if there is any monitoring-data.
+ * If not (because fail2ban is not installed) show this.
+ */
+ $data = unserialize($record['data']);
+ if ($data == ''){
+ $html .= '<p>'.
+ 'fail2ban is not installed at this server.<br />' .
+ 'See more (for debian) <a href="http://www.howtoforge.net/fail2ban_debian_etch" target="htf">here...</a>'.
+ '</p>';
+ }
+ else {
+ $html .= nl2br($data);
+ }
+ $html .= '</div></div>';
+
+ } else {
+ $html = '<p>There is no data available at the moment.</p>';
+ }
+
+ return $html;
+}
+
function showMailq()
{
@@ -402,7 +439,7 @@
$data = unserialize($record['data']);
$html = nl2br($data['output']);
} else {
- $html = '<p>' . "No Mailq-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';
}
return $html;
@@ -414,8 +451,12 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+ /* TODO: datetimeformat should be set somewhat other way */
+ $dateTimeFormat = $app->lng("monitor_settings_datetimeformat_txt");
+
if(isset($record['created'])) {
- $res = date('Y-m-d H:i', $record['created']);
+// $res = date('Y-m-d H:i', $record['created']);
+ $res = date($dateTimeFormat, $record['created']);
} else {
$res = '????-??-?? ??:??';
}
--
Gitblit v1.9.1