From 651fe2596fcfdc69cf243a045188bf9ba402bd2e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 4 Oct 2023 17:08:13 -0400
Subject: [PATCH] Remove debug, add ETAGS subsitution. Fix not doing
 substitutions on the head of a summary email

---
 scripts/zmfilter.pl.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index db551ddde..44888a6d2 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -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);
   }