From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
interface/web/monitor/tools.inc.php | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index f407c60..60d006a 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -314,7 +314,7 @@
}
else {
$data = unserialize($record['data']);
- $html .= nl2br($data['output']);
+ $html .= nl2br(html_entity_decode($data['output']));
}
$html .= '</div></div>';
} else {
@@ -367,10 +367,10 @@
/*
* First, we have to detect, if there is any monitoring-data.
- * If not (because the destribution is not supported) show this.
+ * If not (because the RAID-Controler is not supported yet) show this.
*/
if ($record['state'] == 'no_state') {
- $html .= '<p>'.$app->lng("monitor_nomdadm_txt").'</p>';
+ $html .= '<p>'.$app->lng("monitor_nosupportedraid1_txt").'</p>';
}
else {
$data = unserialize($record['data']);
@@ -450,6 +450,28 @@
return $html;
}
+function showIPTables() {
+ global $app;
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'iptables_rules' 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'].'">';
+ $data = unserialize($record['data']);
+ if ($data == '') {
+ $html .= '<p>Problem, there are no rules listed for the server</p>';
+ }
+ else {
+ $html = nl2br($data['output']);
+ }
+ $html .= '</div></div>';
+ } else {
+ $html = '<p>There is no data available at the moment.</p>';
+ }
+ return $html;
+}
+
+
function showMailq() {
global $app;
--
Gitblit v1.9.1