diff --git a/scripts/zmfilter.pl.z b/scripts/zmfilter.pl.z index 9f46aaaf5..9b22337fa 100755 --- a/scripts/zmfilter.pl.z +++ b/scripts/zmfilter.pl.z @@ -477,7 +477,7 @@ sub sendEmail my $subject = substituteTags( $email_subject, $filter, $event ); my @attachments; - my $body = substituteTags( $email_body, $filter, $event, @attachments ); + my $body = substituteTags( $email_body, $filter, $event, \@attachments ); print( "Sending notification email '$subject'\n" ); print( "$body\n" ) if ( VERBOSE ); @@ -533,7 +533,7 @@ sub sendMessage my $subject = substituteTags( $message_subject, $filter, $event ); my @attachments; - my $body = substituteTags( $message_body, $filter, $event, @$attachments ); + my $body = substituteTags( $message_body, $filter, $event, \@attachments ); print( "Sending notification message '$subject'\n" ); print( "$body\n" ) if ( VERBOSE ); diff --git a/web/zm_funcs.php b/web/zm_funcs.php index 4fd25c8bc..18fcc8c43 100644 --- a/web/zm_funcs.php +++ b/web/zm_funcs.php @@ -207,7 +207,7 @@ function createVideo( $event ) { $command = ZM_PATH_BIN."/zmvideo.pl -e $event[Id]"; $result = exec( $command, $output, $status ); - return( $status?"":$result ); + return( $status?"":rtrim($result) ); } ?>