ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2016-09-19 16:45:13 -04:00
parent e228de6ebe 9347c550c2
commit cc763a858e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/includes/functions.php
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 );
}

2
web/skins/classic/includes/functions.php
View File

@ -249,7 +249,7 @@ function getNavBarHTML() {
</div>
<ul class="list-inline">
<li><?php echo translate('Load') ?>: <?php echo getLoad() ?></li>
<li><?php echo translate('Storage') ?>: <?php echo getDiskPercent() ?>%</li>
<li><?php echo translate('Storage') ?>: <?php echo getDiskPercent() ?></li>
</ul>
</div> <!-- End .footer -->