FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

98_MSwitch.pm:Fix - perlwarning if incoming event json formated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18102 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2018-12-31 08:03:12 +00:00
parent 54b56be966
commit a2e0461637
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fhem/FHEM/98_MSwitch.pm
View File

@ -2452,7 +2452,27 @@ sub MSwitch_Notify($$) {
my $anzahl; my $anzahl;
EVENT: foreach my $event (@eventscopy) { EVENT: foreach my $event (@eventscopy) {
#MSwitch_LOG( $ownName, 0, "$ownName: event -> $event " ); MSwitch_LOG( $ownName, 5, "$ownName: event -> $event " );
if( $event =~ m/(.*)(\{.*\})(.*)/ )
{
MSwitch_LOG( $ownName, 5, "$ownName: changedevent1 -> $1 " );
MSwitch_LOG( $ownName, 5, "$ownName: changedevent2 -> $2 " );
MSwitch_LOG( $ownName, 5, "$ownName: changedevent3 -> $3 " );
my $p1 = $1;
my $json = $2;
my $p3 = $3;
$json =~ s/:/[dp]/g;
$json =~ s/\"/[dst]/g;
$event = $p1.$json.$p3;
MSwitch_LOG( $ownName, 5, "$ownName: changedevent -> $event " );
#next EVENT;
}
$own_hash->{eventsave} = 'unsaved'; $own_hash->{eventsave} = 'unsaved';
MSwitch_LOG( $ownName, 5, MSwitch_LOG( $ownName, 5,
@ -4610,7 +4630,7 @@ sub MSwitch_fhemwebFn($$$$) {
$ret = $ret . "Trigger Device Global Whitelist: $ret = $ret . "Trigger Device Global Whitelist:
</td> </td>
<td></td> <td></td>
<td><input type='text' id ='triggerwhite' name='triggerwhitelist' size='30' value ='" <td><input type='text' id ='triggerwhite' name='triggerwhitelist' size='60' value ='"
. ReadingsVal( $Name, '.Trigger_Whitelist', '' ) . ReadingsVal( $Name, '.Trigger_Whitelist', '' )
. "' onClick=\"javascript:bigwindow(this.id);\" >"; . "' onClick=\"javascript:bigwindow(this.id);\" >";
@ -6886,11 +6906,16 @@ m/(.*?)(\[\[[a-zA-Z][a-zA-Z0-9_]{0,30}:[a-zA-Z0-9_]{0,30}\]-\[[a-zA-Z][a-zA-Z0-9
MSwitch_LOG( $name, 6, MSwitch_LOG( $name, 6,
"$name: Checkcondition - finalstring -> " . $finalstring ); "$name: Checkcondition - finalstring -> " . $finalstring );
#MSwitch_LOG( $name, 0,"name $name ");
my $ret = eval $finalstring; my $ret = eval $finalstring;
MSwitch_LOG( $name, 6, "$name: Checkcondition - return -> " . $ret ); MSwitch_LOG( $name, 6, "$name: Checkcondition - return -> " . $ret );
if ($@) { if ($@) {
MSwitch_LOG( $name, 1, "ERROR: $@ " . __LINE__ ); MSwitch_LOG( $name, 1, "$name ERROR: $@ " . __LINE__ );
MSwitch_LOG( $name, 1, "$finalstring " . __LINE__ ); MSwitch_LOG( $name, 1, "$name $finalstring " . __LINE__ );
$hash->{helper}{conditionerror} = $@; $hash->{helper}{conditionerror} = $@;
return 'false'; return 'false';
@ -8529,6 +8554,19 @@ sub MSwitch_EventBulk($$$$) {
my $evtfull = join( ':', @evtparts ); my $evtfull = join( ':', @evtparts );
$evtparts[2] = '' if !defined $evtparts[2]; $evtparts[2] = '' if !defined $evtparts[2];
$event =~ s/\[dp\]/:/g;
$evtfull =~ s/\[dp\]/:/g;
$evtparts[1] =~ s/\[dp\]/:/g if $evtparts[1];
$evtparts[2] =~ s/\[dp\]/:/g if $evtparts[2];
$event =~ s/\[dst\]/"/g;
$evtfull =~ s/\[dst\]/"/g;
$evtparts[1] =~ s/\[dst\]/"/g if $evtparts[1];
$evtparts[2] =~ s/\[dst\]/"/g if $evtparts[2];
$event =~ s/\[#dp\]/:/g; $event =~ s/\[#dp\]/:/g;
$evtfull =~ s/\[#dp\]/:/g; $evtfull =~ s/\[#dp\]/:/g;
$evtparts[1] =~ s/\[#dp\]/:/g if $evtparts[1]; $evtparts[1] =~ s/\[#dp\]/:/g if $evtparts[1];