From 378935a8a92592cf1ef164b4d969c376c46a78c6 Mon Sep 17 00:00:00 2001
From: nveid <nveid@ispconfig3>
Date: Fri, 09 Dec 2011 02:35:24 -0500
Subject: [PATCH] Fixed mysql error when switching from "Options" tab to "Ftp User" edit tab, the onUpdate thought we were trying to change the Website because the Options Datalog didn't have the parent_domain_id and the Ftp User tab did.
---
interface/web/monitor/tools.inc.php | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 4d0e812..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 {
@@ -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