From 28048cdc2dfa7b5b4e157ce4823bfc9bfaf55489 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 10 Aug 2012 05:45:37 -0400
Subject: [PATCH] Fixed: FS#2291 - Postfix & Dovecot : unknown user
---
server/lib/classes/monitor_tools.inc.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index e81c2de..bd6f6cb 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -238,18 +238,18 @@
//* The state of the email_quota.
$state = 'ok';
- $mailboxes = $app->db->queryAllRecords("SELECT email FROM mail_user WHERE server_id = $server_id");
+ $mailboxes = $app->db->queryAllRecords("SELECT email,maildir 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)) {
+ $filename = $mb['maildir'].'/.quotausage';
+ if(file_exists($filename) && !is_link($filename)) {
$quotafile = file($filename);
$data[$email]['used'] = trim($quotafile['1']);
unset($quotafile);
} else {
- exec('du -s '.escapeshellcmd('/var/vmail/'.$email_parts[1].'/'.$email_parts[0]),$out);
+ exec('du -s '.escapeshellcmd($mb['maildir']),$out);
$parts = explode(' ',$out[0]);
$data[$email]['used'] = intval($parts[0])*1024;
unset($out);
@@ -1683,7 +1683,7 @@
break;
case 'log_messages':
if ($dist == 'debian') {
- $logfile = '/var/log/messages';
+ $logfile = '/var/log/syslog';
} elseif ($dist == 'redhat') {
$logfile = '/var/log/messages';
} elseif ($dist == 'suse') {
--
Gitblit v1.9.1