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

Corrections to videos and attachments. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@477 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-04-13 22:58:31 +00:00
parent 4b11794431
commit 578673d4ea
2 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
scripts/zmfilter.pl.z
View File

@ -475,8 +475,9 @@ sub sendEmail
print( "Creating notification email\n" ); print( "Creating notification email\n" );
my $subject = substituteTags( $email_subject, $filter, \$event ); my $subject = substituteTags( $email_subject, $filter, $event );
my $body = substituteTags( $email_body, $filter, \$event ); my @attachments;
my $body = substituteTags( $email_body, $filter, $event, @attachments );
print( "Sending notification email '$subject'\n" ); print( "Sending notification email '$subject'\n" );
print( "$body\n" ) if ( VERBOSE ); print( "$body\n" ) if ( VERBOSE );
@ -490,17 +491,14 @@ sub sendEmail
Data=>$body Data=>$body
); );
if ( $event->{attachments} ) foreach my $attachment ( @attachments )
{ {
foreach my $attachment ( @{$event->{attachments}} ) print( "Attaching '$attachment->{path}\n" );
{ $mail->attach(
print( "Attaching '$attachment->{path}\n" ); Path=>$attachment->{path},
$mail->attach( Type=>$attachment->{type},
Path=>$attachment->{path}, Encoding=>"base64"
Type=>$attachment->{type}, );
Encoding=>"base64"
);
}
} }
$mail->smtpsend(); $mail->smtpsend();
@ -533,8 +531,9 @@ sub sendMessage
print( "Creating notification message\n" ); print( "Creating notification message\n" );
my $subject = substituteTags( $message_subject, $filter, \$event ); my $subject = substituteTags( $message_subject, $filter, $event );
my $body = substituteTags( $message_body, $filter, \$event ); my @attachments;
my $body = substituteTags( $message_body, $filter, $event, @$attachments );
print( "Sending notification message '$subject'\n" ); print( "Sending notification message '$subject'\n" );
print( "$body\n" ) if ( VERBOSE ); print( "$body\n" ) if ( VERBOSE );
@ -548,17 +547,14 @@ sub sendMessage
Data=>$body Data=>$body
); );
if ( $event->{attachments} ) foreach my $attachment ( @attachments )
{ {
foreach my $attachment ( @{$event->{attachments}} ) print( "Attaching '$attachment->{path}\n" );
{ $mail->attach(
print( "Attaching '$attachment->{path}\n" ); Path=>$attachment->{path},
$mail->attach( Type=>$attachment->{type},
Path=>$attachment->{path}, Encoding=>"base64"
Type=>$attachment->{type}, );
Encoding=>"base64"
);
}
} }
$mail->smtpsend(); $mail->smtpsend();
@ -577,8 +573,8 @@ sub substituteTags
{ {
my $text = shift; my $text = shift;
my $filter = shift; my $filter = shift;
my $event_ref = shift; my $event = shift;
my $event = $$event_ref; my $attachments_ref = shift;
# First we'd better check what we need to get # First we'd better check what we need to get
# We have a filter and an event, do we need any more # We have a filter and an event, do we need any more
@ -651,28 +647,23 @@ sub substituteTags
$text =~ s/%ESM%/$event->{MaxScore}/g; $text =~ s/%ESM%/$event->{MaxScore}/g;
$text =~ s/%EPI1%/$url?view=image&mid=$filter->{MonitorId}&eid=$event->{Id}&fid=$first_alarm_frame->{FrameId}/g; $text =~ s/%EPI1%/$url?view=image&mid=$filter->{MonitorId}&eid=$event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
$text =~ s/%EPIM%/$url?view=image&mid=$filter->{MonitorId}&eid=$event->{Id}&fid=$max_alarm_frame->{FrameId}/g; $text =~ s/%EPIM%/$url?view=image&mid=$filter->{MonitorId}&eid=$event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
if ( $text =~ s/%EI1%/First alarm frame attached/g ) if ( $attachments_ref && $text =~ s/%EI1%/First alarm frame attached/g )
{ {
my $attachments = $event->{attachments}; push( @$attachments_ref, { type=>"image/jpeg", path=>sprintf( "%s/%d/capture-%03d.jpg", $filter->{MonitorName}, $event->{Id}, $first_alarm_frame->{FrameId} ) } );
$attachments = $event->{attachments} = [] if ( !$attachments );
push( @$attachments, { type=>"image/jpeg", path=>sprintf( "%s/%d/capture-%03d.jpg", $filter->{MonitorName}, $event->{Id}, $first_alarm_frame->{FrameId} ) } );
} }
if ( $text =~ s/%EIM%/Max alarm frame attached/g ) if ( $attachments_ref && $text =~ s/%EIM%/Max alarm frame attached/g )
{ {
my $attachments = $event->{attachments}; push( @$attachments_ref, { type=>"image/jpeg", path=>sprintf( "%s/%d/capture-%03d.jpg", $filter->{MonitorName}, $event->{Id}, $max_alarm_frame->{FrameId} ) } );
$attachments = $event->{attachments} = [] if ( !$attachments );
push( @$attachments, { type=>"image/jpeg", path=>sprintf( "%s/%d/capture-%03d.jpg", $filter->{MonitorName}, $event->{Id}, $max_alarm_frame->{FrameId} ) } );
} }
if ( $text =~ s/%EV%/Event video attached/g ) if ( $attachments_ref && $text =~ s/%EV%/Event video attached/g )
{ {
my $attachments = $event->{attachments};
$attachments = $event->{attachments} = [] if ( !$attachments );
my $command = ZM_PATH_BIN."/zmvideo.pl -e $event->{Id}"; my $command = ZM_PATH_BIN."/zmvideo.pl -e $event->{Id}";
my $output = qx($command); my $output = qx($command);
my $status = $? >> 8; my $status = $? >> 8;
if ( $status == 0 ) if ( $status == 0 )
{ {
push( @$attachments, { type=>"video/mpeg", path=>sprintf( "%s/%d/%s", $filter->{MonitorName}, $event->{Id}, $output ) } ); chomp $output;
push( @$attachments_ref, { type=>"video/mpeg", path=>sprintf( "%s/%d/%s", $filter->{MonitorName}, $event->{Id}, $output ) } );
} }
} }
$text =~ s/%FN%/$filter->{Name}/g; $text =~ s/%FN%/$filter->{Name}/g;

1
scripts/zmvideo.pl.z
View File

@ -154,6 +154,7 @@ if ( !-s $video_file )
{ {
die( "Error: $status" ); die( "Error: $status" );
} }
print( LOG "Finished $video_file\n" );
} }
else else
{ {