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: fix zero handling for glances (Forum #16215.msg608351)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13746 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-03-20 10:55:44 +00:00
parent ba244225c4
commit fb24317cf3
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/70_Pushover.pm
View File

@ -1,22 +1,6 @@
# $Id$
###############################################################################
#
# A module to send notifications to Pushover.
#
# written 2013 by Johannes B <johannes_b at icloud.com>
# modified 24.02.2014 by Benjamin Battran <fhem.contrib at benni.achalmblick.de>
# -> Added title, device, priority and sound attributes (see documentation below)
# modified 09.08.2015 by Julian Pawlowski <julian.pawlowski@gmail.com>
# -> Rewrite for Non-Blocking HttpUtils
# -> much more readings
# -> Support for emergency callback via push (see documentation below)
# -> Support for supplementary URLs incl. push callback (e.g. for priority < 2)
# -> Added readingFnAttributes to AttrList
# -> Added support for HTML formatted text
# -> Added user/group token validation
#
###############################################################################
#
# Also see API documentation:
# https://pushover.net/api
@ -29,8 +13,6 @@ use HttpUtils;
use SetExtensions;
use Encode;
no if $] >= 5.017011, warnings => 'experimental';
my %sets = ( "msg" => 1, "glance" => 1 );
#------------------------------------------------------------------------------
@ -256,16 +238,16 @@ sub Pushover_SendCommand($$;$\%) {
HttpUtils_NonblockingGet(
{
url => $URL,
timeout => $timeout,
noshutdown => $http_noshutdown,
data => undef,
hash => $hash,
service => $service,
cmd => $cmd,
type => $type,
url => $URL,
timeout => $timeout,
noshutdown => $http_noshutdown,
data => undef,
hash => $hash,
service => $service,
cmd => $cmd,
type => $type,
httpversion => "1.1",
callback => \&Pushover_ReceiveCommand,
callback => \&Pushover_ReceiveCommand,
}
);
@ -1069,9 +1051,12 @@ sub Pushover_SetMessage2 ($$$$) {
$values{text} = join ' ', @$a;
}
}
$values{subtext} = $h->{subtext} ? $h->{subtext} : undef;
$values{count} = $h->{count} ? $h->{count} : undef;
$values{percent} = $h->{percent} ? $h->{percent} : undef;
$values{subtext} =
defined( $h->{subtext} ) && $h->{subtext} ne "" ? $h->{subtext} : undef;
$values{count} =
defined( $h->{count} ) && $h->{count} ne "" ? $h->{count} : undef;
$values{percent} =
defined( $h->{percent} ) && $h->{percent} ne "" ? $h->{percent} : undef;
my $callback = (
defined( $attr{$name}{callbackUrl} )
@ -1417,6 +1402,10 @@ sub Pushover_CGI() {
if ( !defined( $webArgs->{acknowledged_by} )
|| $webArgs->{acknowledged_by} ne $hash->{USER_KEY} );
return ( "text/plain; charset=utf-8",
"NOK " . $receipt . ": receipt does not exist" )
if ( ReadingsVal( $name, $rAck, "N/A" ) eq "N/A" );
if ( ReadingsVal( $name, $rAck, 1 ) == 0
&& $rBase[1] > int( time() ) )
{