mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-09 15:18:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug, add ETAGS subsitution. Fix not doing substitutions on the head of a summary email

Browse Source
This commit is contained in:
Isaac Connor
2023-10-04 17:08:13 -04:00
parent 582245cdaf
commit 651fe2596f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/zmfilter.pl.in
View File

@@ -733,6 +733,11 @@ sub substituteTags {
$text =~ s/%ESA%/$Event->{AvgScore}/g;
$text =~ s/%ESM%/$Event->{MaxScore}/g;
if ($text =~ /%ETAGS%/) {
my $tags = join(', ', $Event->tags());
$text =~ s/%ETAGS%/$tags/g;
}
if ( $first_alarm_frame ) {
$text =~ s/%EPF1%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
$text =~ s/%EPFM%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
@@ -867,20 +872,15 @@ sub sendSummaryEmail {
return 0;
}
my $subject = substituteTags($$filter{EmailSubject}, $filter);
print "Got $subject";
return 0 if !$subject;
my ($body_head, $summary_part, $body_tail) = split(/%SUMMARY%/m, $$filter{EmailBody});
print "Head: $body_head\n";
print "Summary: $summary_part\n";
print "Tail: $body_tail\n";
if (!$summary_part) {
Error('Failed finding summary part of email body');
return 0;
}
my @attachments;
my $body = $body_head;
my $body = substituteTags($body_head, $filter, undef, \@attachments);
foreach my $event (@events) {
$body .= substituteTags($summary_part, $filter, $event, \@attachments);
}