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.
This commit is contained in:
bhaal2
2016-09-17 02:11:07 +10:00
parent d4645cd94a
commit c95e449bbd

View File

@@ -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 );
}