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

msgSchema: update for Pushover cancel request

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13760 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-03-20 22:13:45 +00:00
parent 44b6aaea19
commit 0bc9e2307a
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/70_Pushover.pm
View File

@ -573,17 +573,17 @@ sub Pushover_ReceiveCommand($$$) {
readingsBulkUpdate( $hash,
"cbCancelId_" . $values->{cbNr},
$values->{cancel_id} )
if ( defined( $values->{cancel_id} ) );
if ( defined( $values->{cancel_id} )
&& $values->{cancel_id} ne "" );
}
else {
readingsBulkUpdate( $hash, "cb_" . $values->{cbNr},
$values->{cbNr} );
}
if ( $values->{action} ne "" ) {
readingsBulkUpdate( $hash, "cbAct_" . $values->{cbNr},
$values->{action} );
}
readingsBulkUpdate( $hash, "cbAct_" . $values->{cbNr},
$values->{action} )
if ( $values->{action} ne "" );
}
}

51
fhem/FHEM/msgSchema.pm
View File

@ -212,38 +212,41 @@ my $db = {
'Pushover' => {
'Normal' =>
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% %MSG%',
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% cancel_id=%Pushover_CANCELID% %MSG%',
'High' =>
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% %MSG%',
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% cancel_id=%Pushover_CANCELID% %MSG%',
'Low' =>
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% %MSG%',
'set %DEVICE% msg title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=%URLTITLE% action=%ACTION% cancel_id=%Pushover_CANCELID% %MSG%',
'defaultValues' => {
'Normal' => {
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
},
'High' => {
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '120',
'EXPIRE' => '600',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '120',
'EXPIRE' => '600',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
},
'Low' => {
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'RECIPIENT' => '',
'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '',
'ACTION' => '',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
},
},
},