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

70_Pushover: fix supplementary URL support

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9248 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2015-09-14 08:40:36 +00:00
parent 131c210df7
commit cac1ffcc35
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/FHEM/70_Pushover.pm
View File

@ -712,8 +712,10 @@ sub Pushover_SetMessage {
$values{cbNr} = int( time() ) + $values{expire}; $values{cbNr} = int( time() ) + $values{expire};
my $cbReading = "cb_" . $values{cbNr}; my $cbReading = "cb_" . $values{cbNr};
$values{cbNr}++ until ( !defined( $hash->{READINGS}{$cbReading}{VAL} ) ) {
until ( !defined( $hash->{READINGS}{$cbReading}{VAL} ) ); $values{cbNr}++;
$cbReading = "cb_" . $values{cbNr};
}
} }
if ( 1 == AttrVal( $hash->{NAME}, "timestamp", 0 ) ) { if ( 1 == AttrVal( $hash->{NAME}, "timestamp", 0 ) ) {
@ -731,10 +733,13 @@ sub Pushover_SetMessage {
{ {
my $url; my $url;
if ( $callback eq "" if (
|| $values{action} !~ /^http[s]?:\/\/.*$/ ) $callback eq ""
|| ( $values{action} !~ /^http[s]?:\/\/.*$/
&& $values{action} =~ /^[\w-]+:\/\/.*$/ )
)
{ {
$url = $values{action}; $url = urlEncode( $values{action} );
$values{expire} = ""; $values{expire} = "";
} }
else { else {
@ -771,10 +776,11 @@ sub Pushover_SetMessage {
Log3 $name, 5, Log3 $name, 5,
"checking to clean up " "checking to clean up "
. $rBase[1] . $hash->{NAME}
. ": ack=" . " $key: time="
. $hash->{READINGS}{$rAck} . $rBase[1] . " ack="
. " time=" . $hash->{READINGS}{$rAck}{VAL}
. " curTime="
. int( time() ); . int( time() );
if ( $hash->{READINGS}{$rAck}{VAL} == 1 if ( $hash->{READINGS}{$rAck}{VAL} == 1
@ -919,7 +925,7 @@ sub Pushover_CGI() {
# run FHEM command if desired # run FHEM command if desired
if ( defined( $hash->{READINGS}{$rAct}{VAL} ) if ( defined( $hash->{READINGS}{$rAct}{VAL} )
&& $hash->{READINGS}{$rAct}{VAL} !~ /^\w.*:\/\/\w.*$/ ) && $hash->{READINGS}{$rAct}{VAL} !~ /^[\w-]+:\/\/.*$/ )
{ {
$redirect = "pushover://"; $redirect = "pushover://";
@ -930,7 +936,7 @@ sub Pushover_CGI() {
# redirect to presented URL # redirect to presented URL
if ( defined( $hash->{READINGS}{$rAct}{VAL} ) if ( defined( $hash->{READINGS}{$rAct}{VAL} )
&& $hash->{READINGS}{$rAct}{VAL} =~ /^\w.*:\/\/\w.*$/ ) && $hash->{READINGS}{$rAct}{VAL} =~ /^[\w-]+:\/\/.*$/ )
{ {
$redirect = $hash->{READINGS}{$rAct}{VAL}; $redirect = $hash->{READINGS}{$rAct}{VAL};
} }
@ -1028,7 +1034,8 @@ sub Pushover_CGI() {
<code>set Pushover1 msg 'Title' 'This is a text.'</code><br> <code>set Pushover1 msg 'Title' 'This is a text.'</code><br>
<code>set Pushover1 msg 'Title' 'This is a text.' '' 0 ''</code><br> <code>set Pushover1 msg 'Title' 'This is a text.' '' 0 ''</code><br>
<code>set Pushover1 msg 'Emergency' 'Security issue in living room.' '' 2 'siren' 30 3600</code><br> <code>set Pushover1 msg 'Emergency' 'Security issue in living room.' '' 2 'siren' 30 3600</code><br>
<code>set Pushover1 msg 'Hint' 'This is a reminder to do something' '' 0 '' '' 3600 'Click here for action' 'set device something'</code><br> <code>set Pushover1 msg 'Hint' 'This is a reminder to do something' '' 0 '' 0 3600 'Click here for action' 'set device something'</code><br>
<code>set Pushover1 msg 'Emergency' 'Security issue in living room.' '' 2 'siren' 30 3600 'Click here for action' 'set device something'</code><br>
</ul> </ul>
<br> <br>
Notes: Notes:
@ -1130,7 +1137,8 @@ sub Pushover_CGI() {
<code>set Pushover1 msg 'Titel' 'Dies ist ein Text.'</code><br> <code>set Pushover1 msg 'Titel' 'Dies ist ein Text.'</code><br>
<code>set Pushover1 msg 'Titel' 'Dies ist ein Text.' '' 0 ''</code><br> <code>set Pushover1 msg 'Titel' 'Dies ist ein Text.' '' 0 ''</code><br>
<code>set Pushover1 msg 'Notfall' 'Sicherheitsproblem im Wohnzimmer.' '' 2 'siren' 30 3600</code><br> <code>set Pushover1 msg 'Notfall' 'Sicherheitsproblem im Wohnzimmer.' '' 2 'siren' 30 3600</code><br>
<code>set Pushover1 msg 'Erinnerung' 'Dies ist eine Erinnerung an etwas' '' 0 '' '' 3600 'Hier klicken, um Aktion auszuführen' 'set device irgendwas'</code><br> <code>set Pushover1 msg 'Erinnerung' 'Dies ist eine Erinnerung an etwas' '' 0 '' 0 3600 'Hier klicken, um Aktion auszuführen' 'set device irgendwas'</code><br>
<code>set Pushover1 msg 'Notfall' 'Sicherheitsproblem im Wohnzimmer.' '' 2 'siren' 30 3600 'Hier klicken, um Aktion auszuführen' 'set device something'</code><br>
</ul> </ul>
<br> <br>
Anmerkungen: Anmerkungen: