maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix calc, add check if quota is enabled

Browse Source
This commit is contained in:
Bobselp
2019-09-24 18:16:07 +02:00
committed by GitHub
parent 14914fce44
commit 31cebccd5d
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Froxlor/Cron/System/MailboxsizeCron.php
View File

@@ -38,16 +38,24 @@ class MailboxsizeCron extends \Froxlor\Cron\FroxlorCron
$_maildir = \Froxlor\FileDir::makeCorrectDir($maildir['maildirpath']);
if (file_exists($_maildir) && is_dir($_maildir)) {
// 1. Check if maildirsize exists (usually when quota is enabled)
$maildirsize = $_maildir.'maildirsize';
if (file_exists($maildirsize)) {
$maildirsize = \Froxlor\FileDir::makeCorrectFile($_maildir . '/maildirsize');
// When quota is enabled and maildirsize file exists, use that to calculate size
if (\Froxlor\Settings::Get('system.mail_quota_enabled') == 1 && file_exists($maildirsize)) {
\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_NOTICE, 'found maildirsize file in ' . $_maildir);
$file = file($maildirsize, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
if (!empty($file[1])) {
$emailusage = floatval(explode(' ', $file[1])[0]);
// Remove header
array_shift($file);
$emailusage = 0;
// Sum up all the changes (line 2 -> end)
foreach ($file as $line) {
$parts = explode(' ', $line);
if (!empty($parts[0])) {
$emailusage += floatval($parts[0]);
}
}
} else {
// 2. If maildirsize file does not exist, compute with du
// if quota is disabled or maildirsize file does not exist, compute with du
// mail-address allows many special characters, see http://en.wikipedia.org/wiki/Email_address#Local_part
$return = false;
$back = \Froxlor\FileDir::safe_exec('du -sk ' . escapeshellarg($_maildir), $return, array(