FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

70_Pushover.pm: Implemented an attribute to toggle SSL.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6835 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jbosecker 2014-10-30 08:33:43 +00:00
parent b2b49c04c1
commit ba563078e6
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
fhem/FHEM/70_Pushover.pm
View File

@ -54,7 +54,7 @@ sub Pushover_Initialize($$)
my ($hash) = @_;
$hash->{DefFn} = "Pushover_Define";
$hash->{SetFn} = "Pushover_Set";
$hash->{AttrList} = "disable:0,1 timestamp:0,1 title sound device priority:0,1,-1";
$hash->{AttrList} = "disable:0,1 timestamp:0,1 title sound device priority:0,1,-1 ssl:0,1";
#a priority value of 2 is not predifined as for this also a value for retry and expire must be set
#which will most likely not be used with default values.
}
@ -110,6 +110,44 @@ sub Pushover_Set($@)
}
}
#------------------------------------------------------------------------------
sub Pushover_HTTP_Call
#------------------------------------------------------------------------------
{
my ($hash,$body,$ssl) = @_;
my $url = "http";
if (1 == $ssl)
{
$url = $url . "s";
}
$url = $url . "://api.pushover.net/1/messages.json";
$response = GetFileFromURL($url, 10, $body, 0, 5);
if ($response =~ m/"status":(.*),/)
{
if ($1 eq "1")
{
return "OK";
}
elsif ($response =~ m/"errors":\[(.*)\]/)
{
return "Error: " . $1;
}
else
{
return "Error";
}
}
else
{
return "Error: No known response"
}
}
#------------------------------------------------------------------------------
sub Pushover_Set_Message
#------------------------------------------------------------------------------
@ -126,6 +164,7 @@ sub Pushover_Set_Message
my $sound=AttrVal($hash->{NAME}, "sound", "");
my $retry="";
my $expire="";
my $ssl=AttrVal($hash->{NAME}, "ssl", 1);
#Split parameters
@ -235,7 +274,7 @@ sub Pushover_Set_Message
$body = $body . "&" . "timestamp=" . time();
}
my $result = Pushover_HTTP_Call($hash, $body);
my $result = Pushover_HTTP_Call($hash, $body, $ssl);
#Save result and data of the last call to the readings.
readingsBeginUpdate($hash);
@ -259,37 +298,6 @@ sub Pushover_Set_Message
}
}
#------------------------------------------------------------------------------
sub Pushover_HTTP_Call($$)
#------------------------------------------------------------------------------
{
my ($hash,$body) = @_;
my $url = "https://api.pushover.net/1/messages.json";
$response = GetFileFromURL($url, 10, $body, 0, 5);
if ($response =~ m/"status":(.*),/)
{
if ($1 eq "1")
{
return "OK";
}
elsif ($response =~ m/"errors":\[(.*)\]/)
{
return "Error: " . $1;
}
else
{
return "Error";
}
}
else
{
return "Error: No known response"
}
}
1;
###############################################################################
@ -375,6 +383,10 @@ sub Pushover_HTTP_Call($$)
<li>sound<br>
Will be used as the default sound if sound argument is missing. If left blank the adjusted sound of the app will be used.
</li><br>
<a name="ssl"></a>
<li>ssl<br>
Send the requests over HTTP or HTTPS. Valid values are 0 = HTTP / 1 = HTTPS. Default is 1.
</li><br>
</ul>
<br>
<a name="PushoverEvents"></a>
@ -465,6 +477,10 @@ sub Pushover_HTTP_Call($$)
<li>sound<br>
Wird beim Senden als Titel verwendet, sofern dieser nicht als Aufrufargument angegeben wurde. Kann auch generell entfallen, dann wird der eingestellte Ton der App verwendet.
</li><br>
<a name="ssl"></a>
<li>ssl<br>
Sende die Requests über HTTP oder HTTPS. Zulässige Werte sind 0 = HTTP / 1 = HTTPS. Standard ist 1.
</li><br>
</ul>
<br>
<a name="PushoverEvents"></a>