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

Fix storagearea lookup. Default to ZM_EVENTS_DIR

This commit is contained in:
Isaac Connor 2017-01-09 16:35:58 -05:00
parent 03fd964518
commit d8b8d78576
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/functions.php
View File

@ -1188,7 +1188,6 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&' ) {
case 'Name':
case 'MonitorId':
case 'StorageId':
$StorageArea = new Storage( $filter['terms'][$i]['val'] );
case 'Length':
case 'Frames':
case 'AlarmFrames':
@ -1203,11 +1202,12 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&' ) {
case 'DiskPercent':
// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
if ( ! $StorageArea ) {
for ( $j = $i; $j < count($filter['terms']); $j++ ) {
for ( $j = 0; $j < count($filter['terms']); $j++ ) {
if ( isset($filter['terms'][$j]['attr']) and $filter['terms'][$j]['attr'] == 'StorageId' ) {
$StorageArea = new Storage( $filter['terms'][$j]['val'] );
}
} // end foreach remaining term
if ( ! $StorageArea ) $StorageArea = new Storage();
} // end no StorageArea found yet
$filter['sql'] .= getDiskPercent( $StorageArea->Path() );