mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-28 02:44:53 +00:00
75_MSG: correct function names
git-svn-id: https://svn.fhem.de/fhem/trunk@13903 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski
parent
f1f5327b54
commit
7d5a03f40b
@ -25,6 +25,7 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
#TODO
|
#TODO
|
||||||
|
# - be able to use type "default" to let read from attr
|
||||||
# - forceType/forceDevice in user parameters
|
# - forceType/forceDevice in user parameters
|
||||||
# - implement default messages in RESIDENTS using msg command
|
# - implement default messages in RESIDENTS using msg command
|
||||||
# - queue message until recipient is available again (e.g. when absent)
|
# - queue message until recipient is available again (e.g. when absent)
|
||||||
@ -108,12 +109,6 @@ sub CommandMsg($$;$$) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
mail => {
|
|
||||||
typeEscalation => {
|
|
||||||
gwUnavailable => 'queue',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
push => {
|
push => {
|
||||||
typeEscalation => {
|
typeEscalation => {
|
||||||
gwUnavailable => 'mail',
|
gwUnavailable => 'mail',
|
||||||
@ -130,12 +125,6 @@ sub CommandMsg($$;$$) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
queue => {
|
|
||||||
typeEscalation => {
|
|
||||||
gwUnavailable => 'mail',
|
|
||||||
emergency => 'mail',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
@ -461,7 +450,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
}
|
}
|
||||||
|
|
||||||
# FATAL ERROR: device does not exist
|
# FATAL ERROR: device does not exist
|
||||||
if ( !msgConfig_IsDevice($device)
|
if ( !IsDevice($device)
|
||||||
&& $deviceType eq "device" )
|
&& $deviceType eq "device" )
|
||||||
{
|
{
|
||||||
$loopReturn3 .= "Device $device does not exist\n"
|
$loopReturn3 .= "Device $device does not exist\n"
|
||||||
@ -581,8 +570,8 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
|
|
||||||
# get device location
|
# get device location
|
||||||
my $deviceLocation =
|
my $deviceLocation =
|
||||||
msgConfig_FindReadingsVal( $device, "location", $typeUc,
|
msgConfig_FindReadingsVal( $device, "location",
|
||||||
"" );
|
$typeUc, "" );
|
||||||
|
|
||||||
my $locationDev = "";
|
my $locationDev = "";
|
||||||
if ( $deviceLocation ne "" && $deviceType eq "device" )
|
if ( $deviceLocation ne "" && $deviceType eq "device" )
|
||||||
@ -648,7 +637,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ( $type[$i] ne "mail"
|
if ( $type[$i] ne "mail"
|
||||||
&& !msgConfig_IsDevice($gatewayDev)
|
&& !IsDevice($gatewayDev)
|
||||||
&& $deviceType eq "device" )
|
&& $deviceType eq "device" )
|
||||||
{
|
{
|
||||||
$useLocation = 2
|
$useLocation = 2
|
||||||
@ -739,7 +728,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
### given device name is already a gateway device itself
|
### given device name is already a gateway device itself
|
||||||
###
|
###
|
||||||
|
|
||||||
my $deviceType2 = msgConfig_GetType($device);
|
my $deviceType2 = GetType($device);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$gatewayDevs eq ""
|
$gatewayDevs eq ""
|
||||||
@ -1303,7 +1292,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
}
|
}
|
||||||
|
|
||||||
elsif ($type[$i] ne "mail"
|
elsif ($type[$i] ne "mail"
|
||||||
&& !msgConfig_IsDevice($gatewayDev)
|
&& !IsDevice($gatewayDev)
|
||||||
&& $deviceType eq "device" )
|
&& $deviceType eq "device" )
|
||||||
{
|
{
|
||||||
$routeStatus = "UNDEFINED";
|
$routeStatus = "UNDEFINED";
|
||||||
@ -1333,7 +1322,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
|
|||||||
)
|
)
|
||||||
|
|
||||||
|| (
|
|| (
|
||||||
msgConfig_IsDevice($gatewayDev)
|
IsDevice($gatewayDev)
|
||||||
&& defined( $defs{$gatewayDev}{STATE} )
|
&& defined( $defs{$gatewayDev}{STATE} )
|
||||||
&& (
|
&& (
|
||||||
grep {
|
grep {
|
||||||
@ -1362,7 +1351,7 @@ 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
|
||||||
|| ( msgConfig_IsDevice($gatewayDev)
|
|| ( IsDevice($gatewayDev)
|
||||||
&& defined( $defs{$gatewayDev}{STATE} )
|
&& defined( $defs{$gatewayDev}{STATE} )
|
||||||
&& $defs{$gatewayDev}{STATE} =~
|
&& $defs{$gatewayDev}{STATE} =~
|
||||||
m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
||||||
@ -1444,24 +1433,24 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
|||||||
$routeStatus .= "+LOCATION";
|
$routeStatus .= "+LOCATION";
|
||||||
}
|
}
|
||||||
|
|
||||||
# add to queue
|
# # add to queue
|
||||||
if (
|
# if (
|
||||||
(
|
# (
|
||||||
$routeStatus eq "USER_DISABLED"
|
# $routeStatus eq "USER_DISABLED"
|
||||||
|| $routeStatus eq "USER_ABSENT"
|
# || $routeStatus eq "USER_ABSENT"
|
||||||
|| $routeStatus eq "USER_ASLEEP"
|
# || $routeStatus eq "USER_ASLEEP"
|
||||||
)
|
# )
|
||||||
&& $routeStatus !~ /^OK/
|
# && $routeStatus !~ /^OK/
|
||||||
&& !$softFail
|
# && !$softFail
|
||||||
)
|
# )
|
||||||
{
|
# {
|
||||||
$routeStatus .= "+QUEUE";
|
# $routeStatus .= "+QUEUE";
|
||||||
}
|
# }
|
||||||
|
|
||||||
my $gatewayType =
|
my $gatewayType =
|
||||||
$type[$i] eq "mail"
|
$type[$i] eq "mail"
|
||||||
? "fhemMsgMail"
|
? "fhemMsgMail"
|
||||||
: msgConfig_GetType( $gatewayDev, "UNDEFINED" );
|
: GetType( $gatewayDev, "UNDEFINED" );
|
||||||
|
|
||||||
my $defTitle = "";
|
my $defTitle = "";
|
||||||
$defTitle =
|
$defTitle =
|
||||||
@ -1903,8 +1892,7 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
|||||||
|
|
||||||
# add user parameters
|
# add user parameters
|
||||||
# if gateway supports parseParams
|
# if gateway supports parseParams
|
||||||
my $gatewayDevType =
|
my $gatewayDevType = GetType($gatewayDev);
|
||||||
msgConfig_GetType($gatewayDev);
|
|
||||||
if (
|
if (
|
||||||
$gatewayDevType
|
$gatewayDevType
|
||||||
&& ref($params) eq "HASH"
|
&& ref($params) eq "HASH"
|
||||||
@ -1934,9 +1922,16 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# queue message
|
# excplicitly queue message
|
||||||
if ( $routeStatus eq "OK_QUEUE" ) {
|
if ( $routeStatus eq "OK_QUEUE" ) {
|
||||||
$queued = 1;
|
$queued = msgConfig_QueueAdd(
|
||||||
|
$msgA, $params,
|
||||||
|
$msgDateTime, $msgID,
|
||||||
|
$sentCounter, $type[$i],
|
||||||
|
$device, $subRecipient,
|
||||||
|
$termRecipient, $priority,
|
||||||
|
$loopTitle, $loopMsg
|
||||||
|
) ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# run command
|
# run command
|
||||||
@ -2043,7 +2038,14 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
|
|||||||
&& $testMode eq "1" )
|
&& $testMode eq "1" )
|
||||||
{
|
{
|
||||||
if ( !( grep { "queue" eq $_ } @type ) ) {
|
if ( !( grep { "queue" eq $_ } @type ) ) {
|
||||||
push @type, "queue";
|
$queued = msgConfig_QueueAdd(
|
||||||
|
$msgA, $params,
|
||||||
|
$msgDateTime, $msgID,
|
||||||
|
$sentCounter, $type[$i],
|
||||||
|
$device, $subRecipient,
|
||||||
|
$termRecipient, $priority,
|
||||||
|
$loopTitle, $loopMsg
|
||||||
|
) ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
Log3 $logDevice, 3,
|
Log3 $logDevice, 3,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user