From 396cfda76562fa0277fc499c8031eb17c0c36cb4 Mon Sep 17 00:00:00 2001
From: Kevin Fourie <kevin@knowledgetree.com>
Date: Mon, 3 Dec 2007 15:22:21 +0000
Subject: [PATCH] KTS-2748 "Wrong filesize units at DiskUsageDashlet and zero-byte lines"

---
 lib/util/ktutil.inc                            | 24 +++++++++++++++++-------
 plugins/housekeeper/DiskUsageDashlet.inc.php   |  2 ++
 plugins/housekeeper/FolderUsageDashlet.inc.php |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc
index ddf6227..f36d61b 100644
--- a/lib/util/ktutil.inc
+++ b/lib/util/ktutil.inc
@@ -44,8 +44,10 @@ class KTUtil {
 	const HOUR_IN_SECS = 3600;
 	const DAY_IN_SECS = 86400;
 	const KB = 1024;
-	const MB = 1048576;
-	const GB = 1073741824;
+    const MB = 1048576;
+    const GB = 1073741824;
+    const TB = 1099511627776;
+    const PB = 1125899906842624;
 
 	static function computePeriod($diff, $suffix = null, $returnArray=false)
 	{
@@ -89,21 +91,29 @@ class KTUtil {
 	{
 		$filesize = (int) $filesize;
 
-		if ($filesize >= KTutil::GB)
+		if ($filesize >= KTutil::PB)
 		{
-			return number_format($filesize /  KTutil::GB, 2, '.',',') . _kt('GB');
+			return number_format($filesize /  KTutil::PETA, 2, '.',',') . _kt('EB');
+		}
+		elseif ($filesize >= KTutil::TB)
+		{
+			return number_format($filesize /  KTutil::TERA, 2, '.',',') . _kt('PB');
+		}
+		elseif ($filesize >= KTutil::GB)
+		{
+			return number_format($filesize /  KTutil::GIGA, 2, '.',',') . _kt('TB');
 		}
 		elseif ($filesize >= KTutil::MB)
 		{
-			return number_format($filesize /  KTutil::MB, 2, '.',',') . _kt('MB');
+			return number_format($filesize /  KTutil::MEGA, 2, '.',',') . _kt('GB');
 		}
 		elseif ($filesize >= KTutil::KB)
 		{
-			return number_format($filesize /  KTutil::KB, 2, '.',',') . _kt('KB');
+			return number_format($filesize /  KTutil::KILO, 2, '.',',') . _kt('MB');
 		}
 		else
 		{
-			return $filesize . _kt('b');
+			return $filesize . _kt('KB');
 		}
 	}
 
diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php
index 498bbd7..9bfc883 100755
--- a/plugins/housekeeper/DiskUsageDashlet.inc.php
+++ b/plugins/housekeeper/DiskUsageDashlet.inc.php
@@ -106,6 +106,8 @@ class DiskUsageDashlet extends KTBaseDashlet
 				preg_match('/(.*)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(.*)/', $line, $matches);
 				list($line, $filesystem, $size, $used, $avail, $usedp, $mount) = $matches;
 
+				if ($size === 0) continue;
+				
 				if ($usedp >= 100 - $this->urgentPercent)
 				{
 					$colour = 'red';
diff --git a/plugins/housekeeper/FolderUsageDashlet.inc.php b/plugins/housekeeper/FolderUsageDashlet.inc.php
index c8ebb4b..f2eba36 100755
--- a/plugins/housekeeper/FolderUsageDashlet.inc.php
+++ b/plugins/housekeeper/FolderUsageDashlet.inc.php
@@ -131,7 +131,7 @@ class FolderUsageDashlet extends KTBaseDashlet
 					'description'=>$name,
 					'folder'=>$directory,
 					'files'=>number_format($temp['files'],0,'.',','),
-					'filesize'=>KTUtil::filesizeToString($temp['filesize']),
+					'filesize'=>KTUtil::filesizeToString($temp['filesize']/1024),
 					'action'=>$i,
 					'canClean'=>$canClean
 				);
--
libgit2 0.21.4