From dec7dbf7926fe0c2443bb63fecfce80c8656d4ee Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Sun, 15 Jan 2006 17:31:23 +0000
Subject: [PATCH] Bug 253 - Added event cause and description tokens.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1821 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 scripts/zmfilter.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/zmfilter.pl b/scripts/zmfilter.pl
index ac2f65ddb..836311d28 100644
--- a/scripts/zmfilter.pl
+++ b/scripts/zmfilter.pl
@@ -235,7 +235,7 @@ sub getFilters
 			}
 		}
 		#Debug( Dumper( %filter_terms ) );
-		my $sql = "select E.Id,E.MonitorId,M.Name as MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.StartTime,unix_timestamp(E.StartTime) as Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed from Events as E inner join Monitors as M on M.Id = E.MonitorId where not isnull(E.EndTime)";
+		my $sql = "select E.Id,E.MonitorId,M.Name as MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.Cause,E.Description,E.StartTime,unix_timestamp(E.StartTime) as Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed from Events as E inner join Monitors as M on M.Id = E.MonitorId where not isnull(E.EndTime)";
 		my $filter_sql = '';
 		for ( my $i = 1; $i <= $filter_terms{trms}; $i++ )
 		{
@@ -808,8 +808,10 @@ sub substituteTags
 	$text =~ s/%EPI%/$url?view=event&mode=still&mid=$event->{MonitorId}&eid=$event->{Id}/g;
 	$text =~ s/%EI%/$event->{Id}/g;
 	$text =~ s/%EN%/$event->{Name}/g;
+	$text =~ s/%EC%/$event->{Cause}/g;
+	$text =~ s/%ED%/$event->{Text}/g;
 	$text =~ s/%ET%/$event->{StartTime}/g;
-	$text =~ s/%ED%/$event->{Length}/g;
+	$text =~ s/%EL%/$event->{Length}/g;
 	$text =~ s/%EF%/$event->{Frames}/g;
 	$text =~ s/%EFA%/$event->{AlarmFrames}/g;
 	$text =~ s/%EST%/$event->{TotScore}/g;