Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-17 ebbe6374fc9c308daf729d2ad1b2f8007ed771ce

 server/lib/classes/cron.d/100-monitor_email_quota.inc.php

@@ -83,7 +83,9 @@
            $filename = $mb['maildir'].'/.quotausage';
            if(file_exists($filename) && !is_link($filename)) {
               $quotafile = file($filename);
               $data[$email]['used'] = trim($quotafile['1']);
               preg_match('/storage.*?([0-9]+)/s', implode('',$quotafile), $storage_value);
               $data[$email]['used'] = $storage_value[1];
               $app->log("Mail storage $email: " . $storage_value[1], LOGLEVEL_DEBUG);
               unset($quotafile);
            } else {
               exec('du -s '.escapeshellcmd($mb['maildir']), $out);