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

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

This commit is contained in:
Isaac Connor 2018-04-20 08:54:38 -04:00
parent 914c608dbc fb44619a66
commit c9e18fa24f
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/zmfilter.pl.in
View File

@ -342,7 +342,13 @@ sub checkFilter {
$Event->lock_and_load();
my $old_diskspace = $$Event{DiskSpace};
if ( $old_diskspace != $Event->DiskSpace(undef) ) {
my $new_diskspace = $Event->DiskSpace(undef);
if (
( (!defined $old_diskspace) and defined $new_diskspace)
or
( (defined $old_diskspace) and (defined $new_diskspace) and ( $old_diskspace != $Event->DiskSpace(undef) ) )
) {
$Event->save();
}
$ZoneMinder::Database::dbh->commit();

2
web/api/app/Plugin/CakePHP-Enum-Behavior

@ -1 +1 @@
Subproject commit ca91b87fda8e006e4fca2ed870f24f9a29c2905d
Subproject commit 7108489f218c54d36d235d3af91d6da2f8311237

2
web/api/app/Plugin/Crud

@ -1 +1 @@
Subproject commit 1351dde6b4c75b215099ae8bcf5a21d6c6e10298
Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5

1
web/skins/classic/views/console.php
View File

@ -208,6 +208,7 @@ ob_start();
<?php
$table_head = ob_get_contents();
ob_end_clean();
echo $table_head;
for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
$monitor = $displayMonitors[$monitor_i];
$Monitor = new Monitor($monitor);