mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-05 02:19:31 +00:00
99_msg: consider state “asleep” for recipient
git-svn-id: https://svn.fhem.de/fhem/trunk@9387 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
5611ba3129
commit
139b9fa263
@ -1674,12 +1674,19 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
|
|||||||
{
|
{
|
||||||
$routeStatus = "USER_ABSENT";
|
$routeStatus = "USER_ABSENT";
|
||||||
}
|
}
|
||||||
|
elsif ($type[$i] ne "push"
|
||||||
|
&& $type[$i] ne "mail"
|
||||||
|
&& $residentDevState eq "asleep" )
|
||||||
|
{
|
||||||
|
$routeStatus = "USER_ASLEEP";
|
||||||
|
}
|
||||||
|
|
||||||
# enforce by user request
|
# enforce by user request
|
||||||
if (
|
if (
|
||||||
(
|
(
|
||||||
$routeStatus eq "USER_DISABLED"
|
$routeStatus eq "USER_DISABLED"
|
||||||
|| $routeStatus eq "USER_ABSENT"
|
|| $routeStatus eq "USER_ABSENT"
|
||||||
|
|| $routeStatus eq "USER_ASLEEP"
|
||||||
)
|
)
|
||||||
&& ( $forceType == 1 || $forceDevice == 1 )
|
&& ( $forceType == 1 || $forceDevice == 1 )
|
||||||
)
|
)
|
||||||
@ -1692,6 +1699,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
|
|||||||
(
|
(
|
||||||
$routeStatus eq "USER_DISABLED"
|
$routeStatus eq "USER_DISABLED"
|
||||||
|| $routeStatus eq "USER_ABSENT"
|
|| $routeStatus eq "USER_ABSENT"
|
||||||
|
|| $routeStatus eq "USER_ASLEEP"
|
||||||
)
|
)
|
||||||
&& $loopPriority >= $prioThresGwEmg
|
&& $loopPriority >= $prioThresGwEmg
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user