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: preparations for message queue

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13862 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-03-31 23:34:32 +00:00
parent 524957f6eb
commit a7b89a9c88
3 changed files with 735 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1118
FHEM/75_MSG.pm
View File

File diff suppressed because it is too large Load Diff

22
FHEM/75_msgConfig.pm
View File

@ -144,19 +144,29 @@ sub msgConfig_Initialize($) {
msgTitleShrtText
msgTitleShrtTextHigh
msgTitleShrtTextLow
msgType:text,push,mail,screen,light,audio,queue
);
use warnings 'qw';
$hash->{AttrList} = join( " ", @attrList ) . " " . $readingFnAttributes;
# add global attributes
foreach (
"msgContactAudio", "msgContactMail", "msgContactPush",
"msgContactScreen", "msgContactLight", "msgParams",
"msgPriority", "msgRecipient", "msgRecipientAudio",
"msgRecipientMail", "msgRecipientPush", "msgRecipientScreen",
"msgRecipientText", "msgRecipientLight", "msgTitle",
"msgContactAudio",
"msgContactMail",
"msgContactPush",
"msgContactScreen",
"msgContactLight",
"msgParams",
"msgPriority",
"msgRecipient",
"msgRecipientAudio",
"msgRecipientMail",
"msgRecipientPush",
"msgRecipientScreen",
"msgRecipientText",
"msgRecipientLight",
"msgTitle",
"msgTitleShrt",
"msgType:text,push,mail,screen,light,audio,queue",
)
{
addToAttrList($_);

18
FHEM/msgSchema.pm
View File

@ -378,17 +378,17 @@ my $db = {
'PostMe' => {
'Normal' =>
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%: %SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%%SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'High' =>
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_PRIO%: %PRIOCAT%/%PRIORITY%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%: %SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_PRIO%%PRIOCAT%/%PRIORITY%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%%SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'Low' =>
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_PRIO%: %PRIOCAT%/%PRIORITY%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%: %SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'set %DEVICE% create %TITLESHRT2%_%MSGID%; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSGDATETIME%; set %DEVICE% add %TITLESHRT2%_%MSGID% %TITLE%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_PRIO%%PRIOCAT%/%PRIORITY%; set %DEVICE% add %TITLESHRT2%_%MSGID% %PostMe_TO%%SRCALIAS% (%SOURCE%); set %DEVICE% add %TITLESHRT2%_%MSGID% _________________________; set %DEVICE% add %TITLESHRT2%_%MSGID% %MSG%',
'defaultValues' => {
'Normal' => {
'TITLE' => 'Info',
'PostMe_TO' => 'To',
'PostMe_SUB' => 'Subject',
'PostMe_PRIO' => 'Priority',
'PostMe_TO' => 'To: ',
'PostMe_SUB' => 'Subject: ',
'PostMe_PRIO' => 'Priority: ',
},
'High' => {
'TITLE' => 'Warning',
@ -398,9 +398,9 @@ my $db = {
},
'Low' => {
'TITLE' => 'Notice',
'PostMe_TO' => 'To',
'PostMe_SUB' => 'Subject',
'PostMe_PRIO' => 'Priority',
'PostMe_TO' => 'To: ',
'PostMe_SUB' => 'Subject: ',
'PostMe_PRIO' => 'Priority: ',
},
},
},