From 6ef2d9cbd7d7ecfcfd8fefb9bc249b84a2302d54 Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 10 Nov 2011 08:53:04 -0500
Subject: [PATCH] fix html markup errors and update code
---
server/lib/classes/monitor_tools.inc.php | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index b7c4ef1..26768c3 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -151,7 +151,7 @@
//** Email Quota
public function monitorEmailQuota() {
- global $conf;
+ global $conf, $app;
//* Initialize data array
$data = array();
@@ -164,8 +164,25 @@
//* The state of the email_quota.
$state = 'ok';
+
+ $mailboxes = $app->db->queryAllRecords("SELECT email FROM mail_user WHERE server_id = $server_id");
+ if(is_array($mailboxes)) {
+ foreach($mailboxes as $mb) {
+ $email = $mb['email'];
+ $email_parts = explode('@',$mb['email']);
+ $filename = '/var/vmail/'.$email_parts[1].'/'.$email_parts[0].'/.quotausage';
+ if(file_exists($filename)) {
+ $quotafile = file($filename);
+ $data[$email]['used'] = trim($quotafile['1']);
+ unset($quotafile);
+ }
+ }
+ }
+
+ unset($mailboxes);
//* Dovecot quota check Courier in progress lathama@gmail.com
+ /*
if($dir = opendir("/var/vmail")){
while (($quotafiles = readdir($dir)) !== false){
if(preg_match('/.\_quota$/', $quotafiles)){
@@ -177,6 +194,7 @@
}
closedir($dir);
}
+ */
$res['server_id'] = $server_id;
$res['type'] = $type;
$res['data'] = $data;
@@ -869,6 +887,9 @@
$state = 'no_state';
$data['output'] = '';
}
+
+ //* Encode data
+ $data['output'] = htmlentities($data['output']);
/*
* Return the Result
@@ -1204,7 +1225,23 @@
system('which iptables', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
- $data['output'] = shell_exec('iptables -S');
+ $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S');
+
+ /*
+ * At this moment, there is no state (maybe later)
+ */
+ $state = 'no_state';
+ } else {
+ $state = 'no_state';
+ $data = '';
+ }
+
+
+ /* This monitoring is only available if fail2ban is installed */
+ system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
+ if ($retval === 0) {
+ /* Get the data of the log */
+ $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S');
/*
* At this moment, there is no state (maybe later)
--
Gitblit v1.9.1