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

added parameter '-k' to the 'du' command in traffic-cron, -k displays block counts in 1024-byte (1-Kbyte) blocks (lead to wrong filesize-calculations on FreeBSD), fixes #578

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-09 09:47:44 +01:00
parent 3a3aa73d2d
commit 6dca567827
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/jobs/cron_traffic.php
View File

@@ -290,7 +290,7 @@ while($row = $db->fetch_array($result))
if(file_exists($row['documentroot']) && is_dir($row['documentroot'])) if(file_exists($row['documentroot']) && is_dir($row['documentroot']))
{ {
$back = safe_exec('du -s ' . escapeshellarg($row['documentroot']) . ''); $back = safe_exec('du -sk ' . escapeshellarg($row['documentroot']) . '');
foreach($back as $backrow) foreach($back as $backrow)
{ {
$webspaceusage = explode(' ', $backrow); $webspaceusage = explode(' ', $backrow);
@@ -314,7 +314,7 @@ while($row = $db->fetch_array($result))
$maildir = makeCorrectDir($settings['system']['vmail_homedir'] . $row['loginname']); $maildir = makeCorrectDir($settings['system']['vmail_homedir'] . $row['loginname']);
if(file_exists($maildir) && is_dir($maildir)) if(file_exists($maildir) && is_dir($maildir))
{ {
$back = safe_exec('du -s ' . escapeshellarg($maildir) . ''); $back = safe_exec('du -sk ' . escapeshellarg($maildir) . '');
foreach($back as $backrow) foreach($back as $backrow)
{ {
$emailusage = explode(' ', $backrow); $emailusage = explode(' ', $backrow);