From 251684617601374eaa640b3f3ef6f15003197aff Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 19 Apr 2018 14:22:19 -0400 Subject: [PATCH 1/2] only update DiskSpace if new DiskSpace is defined --- scripts/zmfilter.pl.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in index 12dae98cf..20c8569d8 100644 --- a/scripts/zmfilter.pl.in +++ b/scripts/zmfilter.pl.in @@ -340,7 +340,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(); From fb44619a667c1a62c807bf9995631dfaa0565131 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 19 Apr 2018 14:33:05 -0400 Subject: [PATCH 2/2] output the initial table head --- web/api/app/Plugin/CakePHP-Enum-Behavior | 2 +- web/api/app/Plugin/Crud | 2 +- web/skins/classic/views/console.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/api/app/Plugin/CakePHP-Enum-Behavior b/web/api/app/Plugin/CakePHP-Enum-Behavior index ca91b87fd..7108489f2 160000 --- a/web/api/app/Plugin/CakePHP-Enum-Behavior +++ b/web/api/app/Plugin/CakePHP-Enum-Behavior @@ -1 +1 @@ -Subproject commit ca91b87fda8e006e4fca2ed870f24f9a29c2905d +Subproject commit 7108489f218c54d36d235d3af91d6da2f8311237 diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud index 1351dde6b..c3976f147 160000 --- a/web/api/app/Plugin/Crud +++ b/web/api/app/Plugin/Crud @@ -1 +1 @@ -Subproject commit 1351dde6b4c75b215099ae8bcf5a21d6c6e10298 +Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5 diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 298e82246..1db519a18 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -208,6 +208,7 @@ ob_start();