FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

msgSchema: remove obsolete default parameters in favor of user parameters

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13941 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-04-08 20:01:49 +00:00
parent 66f1495d02
commit 0971dd6029
1 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
fhem/FHEM/msgSchema.pm
View File

@ -173,18 +173,18 @@ my $db = {
}, },
'Jabber' => { 'Jabber' => {
'Normal' => 'set %DEVICE% msg%JabberMsgType% %RECIPIENT% %MSG%', 'Normal' => 'set %DEVICE% msg%Jabber_MTYPE% %RECIPIENT% %MSG%',
'High' => 'set %DEVICE% msg%JabberMsgType% %RECIPIENT% %MSG%', 'High' => 'set %DEVICE% msg%Jabber_MTYPE% %RECIPIENT% %MSG%',
'Low' => 'set %DEVICE% msg%JabberMsgType% %RECIPIENT% %MSG%', 'Low' => 'set %DEVICE% msg%Jabber_MTYPE% %RECIPIENT% %MSG%',
'defaultValues' => { 'defaultValues' => {
'Normal' => { 'Normal' => {
'JabberMsgType' => '', 'Jabber_MTYPE' => '',
}, },
'High' => { 'High' => {
'JabberMsgType' => '', 'Jabber_MTYPE' => '',
}, },
'Low' => { 'Low' => {
'JabberMsgType' => '', 'Jabber_MTYPE' => '',
}, },
}, },
}, },
@ -214,22 +214,17 @@ my $db = {
'Pushover' => { 'Pushover' => {
'Normal' => 'Normal' =>
'set %DEVICE% %Pushover_PTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=\'%URLTITLE%\' action=\'%ACTION%\' cancel_id=\'%Pushover_CANCELID%\' message=\'%MSG%\'', 'set %DEVICE% %Pushover_MTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% url_title="%URLTITLE%" message=\'%MSG%\'',
'High' => 'High' =>
'set %DEVICE% %Pushover_PTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=\'%URLTITLE%\' action=\'%ACTION%\' cancel_id=\'%Pushover_CANCELID%\' message=\'%MSG%\'', 'set %DEVICE% %Pushover_MTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% url_title="%URLTITLE%" retry=%RETRY% expire=%EXPIRE% message=\'%MSG%\'',
'Low' => 'Low' =>
'set %DEVICE% %Pushover_PTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% sound=\'%Pushover_SOUND%\' retry=%RETRY% expire=%EXPIRE% url_title=\'%URLTITLE%\' action=\'%ACTION%\' cancel_id=\'%Pushover_CANCELID%\' message=\'%MSG%\'', 'set %DEVICE% %Pushover_MTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% url_title="%URLTITLE%" message=\'%MSG%\'',
'defaultValues' => { 'defaultValues' => {
'Normal' => { 'Normal' => {
'RECIPIENT' => '', 'RECIPIENT' => '',
'TERMINAL' => '', 'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'Pushover_MTYPE' => 'msg',
'Pushover_PTYPE' => 'msg',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
}, },
'High' => { 'High' => {
'RECIPIENT' => '', 'RECIPIENT' => '',
@ -237,32 +232,24 @@ my $db = {
'RETRY' => '120', 'RETRY' => '120',
'EXPIRE' => '600', 'EXPIRE' => '600',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'Pushover_MTYPE' => 'msg',
'Pushover_PTYPE' => 'msg',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
}, },
'Low' => { 'Low' => {
'RECIPIENT' => '', 'RECIPIENT' => '',
'TERMINAL' => '', 'TERMINAL' => '',
'RETRY' => '',
'EXPIRE' => '',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'Pushover_MTYPE' => 'msg',
'Pushover_PTYPE' => 'msg',
'Pushover_SOUND' => '',
'Pushover_CANCELID' => '',
}, },
}, },
}, },
'Pushsafer' => { 'Pushsafer' => {
'Normal' => 'Normal' =>
'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" sound="%Pushsafer_SOUND%" icon="%Pushsafer_ICON%" vibration="%Pushsafer_VIBRATION%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"', 'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" vibration="%Pushsafer_VIBRATION%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"',
'High' => 'High' =>
'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" sound="%Pushsafer_SOUND%" icon="%Pushsafer_ICON%" vibration="%Pushsafer_VIBRATION%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"', 'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" vibration="%Pushsafer_VIBRATION%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"',
'Low' => 'Low' =>
'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" sound="%Pushsafer_SOUND%" icon="%Pushsafer_ICON%" vibration="%Pushsafer_VIBRATION%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"', 'set %DEVICE% message "%MSG%" title="%TITLE%" key="%RECIPIENT%" device="%TERMINAL%" url="%ACTION%" urlText="%URLTITLE%" ttl="%EXPIRE%"',
'defaultValues' => { 'defaultValues' => {
'Normal' => { 'Normal' => {
'RECIPIENT' => '', 'RECIPIENT' => '',
@ -270,8 +257,6 @@ my $db = {
'EXPIRE' => '', 'EXPIRE' => '',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'ACTION' => '',
'Pushsafer_ICON' => '',
'Pushsafer_SOUND' => '',
'Pushsafer_VIBRATION' => '1', 'Pushsafer_VIBRATION' => '1',
}, },
'High' => { 'High' => {
@ -280,8 +265,6 @@ my $db = {
'EXPIRE' => '', 'EXPIRE' => '',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'ACTION' => '',
'Pushsafer_ICON' => '',
'Pushsafer_SOUND' => '',
'Pushsafer_VIBRATION' => '2', 'Pushsafer_VIBRATION' => '2',
}, },
'Low' => { 'Low' => {
@ -290,9 +273,6 @@ my $db = {
'EXPIRE' => '', 'EXPIRE' => '',
'URLTITLE' => '', 'URLTITLE' => '',
'ACTION' => '', 'ACTION' => '',
'Pushsafer_ICON' => '',
'Pushsafer_SOUND' => '',
'Pushsafer_VIBRATION' => '',
}, },
}, },
}, },
@ -331,20 +311,20 @@ my $db = {
}, },
'ENIGMA2' => { 'ENIGMA2' => {
'Normal' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%', 'Normal' => 'set %DEVICE% msg %ENIGMA2_MTYPE% %TIMEOUT% %MSG%',
'High' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%', 'High' => 'set %DEVICE% msg %ENIGMA2_MTYPE% %TIMEOUT% %MSG%',
'Low' => 'set %DEVICE% msg %ENIGMA2_TYPE% %TIMEOUT% %MSG%', 'Low' => 'set %DEVICE% msg %ENIGMA2_MTYPE% %TIMEOUT% %MSG%',
'defaultValues' => { 'defaultValues' => {
'Normal' => { 'Normal' => {
'ENIGMA2_TYPE' => 'info', 'ENIGMA2_MTYPE' => 'info',
'TIMEOUT' => 8, 'TIMEOUT' => 8,
}, },
'High' => { 'High' => {
'ENIGMA2_TYPE' => 'attention', 'ENIGMA2_MTYPE' => 'attention',
'TIMEOUT' => 12, 'TIMEOUT' => 12,
}, },
'Low' => { 'Low' => {
'ENIGMA2_TYPE' => 'message', 'ENIGMA2_MTYPE' => 'message',
'TIMEOUT' => 8, 'TIMEOUT' => 8,
}, },
}, },