From c95e449bbdc403a5ed690159fbd56e423df6d33f Mon Sep 17 00:00:00 2001
From: bhaal2 <bhaal@darkrealm.net>
Date: Sat, 17 Sep 2016 02:11:07 +1000
Subject: [PATCH] Modifications to getDiskPercent(): Moved '%' to this function
 instead of at end of html in skins/classing/include/functions.php Changed
 from SQL query to Storage area object model.

---
 web/includes/functions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 9087c7c6d..2b97456f7 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1477,12 +1477,12 @@ function getDiskPercent() {
   else {
       $spaceString = '';
   }
-  $storageAreas = dbFetchAll("select path, name from Storage order by Id");
-  foreach($storageAreas as $storagePath) {
-      $storageTotal = disk_total_space($storagePath['path']);
-      $storageFree = disk_free_space($storagePath['path']);
+  $storageAreas = Storage::find_all();
+  foreach($storageAreas as $storageArea) {
+      $storageTotal = disk_total_space($storageArea->Path);
+      $storageFree = disk_free_space($storageArea->Path);
       $storageSpace = round(($storageTotal - $storageFree) / $storageTotal * 100);
-      $spaceString .= ', '.$storagePath['name'].' '.$storageSpace;
+      $spaceString .= ', '.$storageArea->Name.' '.$storageSpace.'%';
   }
   return( $spaceString );
 }