ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add EPATH to substitutions and don't add path to execute unless no substitutions are being done

pull/3621/head
Isaac Connor 2022-09-28 11:08:06 -04:00
parent ae07db6104
commit 3e43a1159a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/zmfilter.pl.in
View File

@ -696,6 +696,7 @@ sub substituteTags {
$text =~ s/%EP%/$url?view=event&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
$text =~ s/%EPS%/$url?view=event&mode=stream&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
$text =~ s/%EPI%/$url?view=event&mode=still&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
$text =~ s/%EPATH%/$Event->Path()/g;
$text =~ s/%EI%/$Event->{Id}/g;
$text =~ s/%EN%/$Event->{Name}/g;
$text =~ s/%EC%/$Event->{Cause}/g;
@ -1036,8 +1037,12 @@ sub executeCommand {
my $filter = shift;
my $Event = shift;
my $command = $filter->{AutoExecuteCmd}.' '.$Event->Path();
$command = substituteTags($command, $filter, $Event);
my $command = $filter->{AutoExecuteCmd};
if ($command =~ /%\w+.%/) {
$command = substituteTags($command, $filter, $Event);
} else {
' '.$Event->Path();
}
Info("Executing '$command'");
my $output = qx($command);