From 5edd1ce9d5619a8af7e46c4c64cb682a4de2a0cc Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Mon, 23 Jun 2008 14:22:59 +0000 Subject: [PATCH] Merged in from DEV trunk... --- plugins/housekeeper/DiskUsageDashlet.inc.php | 5 +++-- plugins/housekeeper/FolderUsageDashlet.inc.php | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php index cd89f18..5d84e51 100644 --- a/plugins/housekeeper/DiskUsageDashlet.inc.php +++ b/plugins/housekeeper/DiskUsageDashlet.inc.php @@ -47,8 +47,9 @@ class DiskUsageDashlet extends KTBaseDashlet function is_active($oUser) { - $usage = unserialize(KTUtil::getSystemSetting('DiskUsage','n/a')); - if ($usage == 'n/a') return false; + $usage = KTUtil::getSystemSetting('DiskUsage'); + if (empty($usage)) return false; + $usage = unserialize($usage); $this->usage = $usage; return Permission::userIsSystemAdministrator(); } diff --git a/plugins/housekeeper/FolderUsageDashlet.inc.php b/plugins/housekeeper/FolderUsageDashlet.inc.php index 020f6d7..7b28106 100644 --- a/plugins/housekeeper/FolderUsageDashlet.inc.php +++ b/plugins/housekeeper/FolderUsageDashlet.inc.php @@ -47,6 +47,11 @@ class FolderUsageDashlet extends KTBaseDashlet function is_active($oUser) { + $usage = KTUtil::getSystemSetting('KTUsage'); + if (empty($usage)) return false; + + $this->usage = unserialize($usage); + return Permission::userIsSystemAdministrator(); } @@ -69,11 +74,11 @@ class FolderUsageDashlet extends KTBaseDashlet $dispatcherURL = '/'.$dispatcherURL; } - $usage = unserialize(KTUtil::getSystemSetting('KTUsage','n/a')); + $aTemplateData = array( 'context' => $this, - 'usages'=>$usage, + 'usages'=>$this->usage, 'dispatcherURL'=>$dispatcherURL ); -- libgit2 0.21.4