From 9cf2c25a64a23a1be36f9cd0af8aac150b659f14 Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Fri, 28 Oct 2011 11:33:06 -0400
Subject: [PATCH] start adding SPF by adding enum in table

---
 server/lib/classes/monitor_tools.inc.php |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 4e82e0a..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

--
Gitblit v1.9.1