Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

75_MSG: add support for ReplaceSetMagic for attributes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13279 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-01-30 00:50:12 +00:00
parent 05a8a9faf1
commit a1dd851d3d
1 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
fhem/FHEM/75_MSG.pm
View File

@ -51,6 +51,13 @@ sub CommandMsg($$;$$) {
my ( $cl, $msg, $testMode ) = @_; my ( $cl, $msg, $testMode ) = @_;
my $return = ""; my $return = "";
if ( $featurelevel >= 5.7 ) {
my %dummy;
my ( $err, @a ) = ReplaceSetMagic( \%dummy, 0, ($msg) );
$msg = join( " ", @a )
unless ($err);
}
# find existing msgConfig device or create a new instance # find existing msgConfig device or create a new instance
my $globalDevName = "globalMsg"; my $globalDevName = "globalMsg";
if ( defined( $modules{msgConfig}{defptr} ) ) { if ( defined( $modules{msgConfig}{defptr} ) ) {
@ -455,6 +462,15 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
# lookup matching location # lookup matching location
foreach (@locationDevs) { foreach (@locationDevs) {
if ( $featurelevel >= 5.7 ) {
my %dummy;
my ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($_) );
$_ = join( " ", @a )
unless ($err);
}
my $lName = my $lName =
AttrVal( $_, "msgLocationName", "" ); AttrVal( $_, "msgLocationName", "" );
if ( $lName ne "" && $lName eq $deviceLocation ) if ( $lName ne "" && $lName eq $deviceLocation )
@ -464,6 +480,14 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
} }
} }
if ( $featurelevel >= 5.7 ) {
my %dummy;
my ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($locationDev) );
$locationDev = join( " ", @a )
unless ($err);
}
# look for gateway device # look for gateway device
$gatewayDevs = $gatewayDevs =
@ -498,6 +522,15 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
# non-location contacts # non-location contacts
if ( $gatewayDevs ne "" ) { if ( $gatewayDevs ne "" ) {
if ( $featurelevel >= 5.7 ) {
my %dummy;
my ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0,
($gatewayDevs) );
$gatewayDevs = join( " ", @a )
unless ($err);
}
foreach foreach
my $gatewayDevOr ( split /\|/, $gatewayDevs ) my $gatewayDevOr ( split /\|/, $gatewayDevs )
{ {
@ -517,11 +550,8 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
$useLocation = 2 $useLocation = 2
if ( $useLocation == 0 ); if ( $useLocation == 0 );
} }
elsif ( elsif ( $type[$i] ne "mail"
$type[$i] ne "mail" && IsDisabled($gatewayDev) )
&& AttrVal( $gatewayDev, "disable",
"0" ) eq "1"
)
{ {
$useLocation = 2 $useLocation = 2
if ( $useLocation == 0 ); if ( $useLocation == 0 );
@ -529,54 +559,28 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
elsif ( elsif (
$type[$i] ne "mail" $type[$i] ne "mail"
&& ( && (
AttrVal( ReadingsVal(
$gatewayDev, "disable",
"0"
) eq "1"
|| ReadingsVal(
$gatewayDev, "power",
"on"
) eq "off"
|| ReadingsVal(
$gatewayDev, "presence", $gatewayDev, "presence",
"present" "present"
) eq "absent" ) =~
|| ReadingsVal( m/^(0|false|absent|disappeared|unauthorized|disconnected|unreachable)$/i
$gatewayDev, "presence",
"appeared"
) eq "disappeared"
|| ReadingsVal( || ReadingsVal(
$gatewayDev, "state", $gatewayDev, "state",
"present" "present"
) eq "absent" ) =~
|| ReadingsVal( m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
$gatewayDev, "state", || ( $defs{$gatewayDev}{STATE}
"connected" && $defs{$gatewayDev}{STATE}
) eq "unauthorized" =~ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|| ReadingsVal( )
$gatewayDev, "state",
"connected"
) eq "disconnected"
|| ReadingsVal(
$gatewayDev, "state",
"reachable"
) eq "unreachable"
|| ReadingsVal(
$gatewayDev, "available",
"1"
) eq "0"
|| ReadingsVal( || ReadingsVal(
$gatewayDev, "available", $gatewayDev, "available",
"yes" "yes"
) eq "no" ) =~ m/^(0|no|false)$/i
|| ReadingsVal(
$gatewayDev, "reachable",
"1"
) eq "0"
|| ReadingsVal( || ReadingsVal(
$gatewayDev, "reachable", $gatewayDev, "reachable",
"yes" "yes"
) eq "no" ) =~ m/^(0|no|false)$/i
) )
) )
{ {
@ -1566,6 +1570,14 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
) )
); );
if ( $featurelevel >= 5.7 ) {
my %dummy;
my ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($gatewayDevs) );
$gatewayDevs = join( " ", @a )
unless ($err);
}
my %gatewaysStatus; my %gatewaysStatus;
foreach my $gatewayDevOr ( split /\|/, $gatewayDevs ) { foreach my $gatewayDevOr ( split /\|/, $gatewayDevs ) {
@ -1609,7 +1621,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
&& ( && (
ReadingsVal( $gatewayDev, "presence", ReadingsVal( $gatewayDev, "presence",
"present" ) =~ "present" ) =~
m/^(0|absent|disappeared|unauthorized|disconnected|unreachable)$/i m/^(0|false|absent|disappeared|unauthorized|disconnected|unreachable)$/i
|| ReadingsVal( $gatewayDev, "state", || ReadingsVal( $gatewayDev, "state",
"present" ) =~ "present" ) =~
m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
@ -1618,9 +1630,9 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
) )
|| ReadingsVal( $gatewayDev, "available", || ReadingsVal( $gatewayDev, "available",
"yes" ) =~ m/^(0|no)$/i "yes" ) =~ m/^(0|no|off|false)$/i
|| ReadingsVal( $gatewayDev, "reachable", || ReadingsVal( $gatewayDev, "reachable",
"yes" ) =~ m/^(0|no)$/i "yes" ) =~ m/^(0|no|off|false)$/i
) )
) )
{ {
@ -1902,24 +1914,6 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
my %dummy; my %dummy;
my ( $err, @a ); my ( $err, @a );
# MSG
( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($loopMsg) );
$replaceError .=
"ReplaceSetMagic failed for MSG: $err\n"
if ($err);
$loopMsg = join( " ", @a )
unless ($err);
# DEVICE
( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($gatewayDev) );
$replaceError .=
"ReplaceSetMagic failed for DEVICE: $err\n"
if ($err);
$gatewayDev = join( " ", @a )
unless ($err);
# TITLE # TITLE
( $err, @a ) = ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ($loopTitle) ); ReplaceSetMagic( \%dummy, 0, ($loopTitle) );
@ -1943,7 +1937,7 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
} }
# TERMINAL # TERMINAL
if ( $subRecipient ne "" ) { if ( $termRecipient ne "" ) {
( $err, @a ) = ( $err, @a ) =
ReplaceSetMagic( \%dummy, 0, ReplaceSetMagic( \%dummy, 0,
($termRecipient) ); ($termRecipient) );