[Openautomation-svn] SF.net SVN: openautomation:[1113] wiregate/plugin/generic/Logikprozessor.pl

[<dpe...@us...>]

Revision: 1113
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1113&view=rev
Author:   dpesch01
Date:     2012-11-10 10:14:56 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
sendProwl um Zugrif auf %settings erweitert

Modified Paths:
--------------
    wiregate/plugin/generic/Logikprozessor.pl

Modified: wiregate/plugin/generic/Logikprozessor.pl
===================================================================
--- wiregate/plugin/generic/Logikprozessor.pl	2012-11-10 05:45:58 UTC (rev 1112)
+++ wiregate/plugin/generic/Logikprozessor.pl	2012-11-10 10:14:56 UTC (rev 1113)
@@ -939,14 +939,15 @@
 sub sendProwl {
     my (%parameters)=@_;
     my ($priority, $event, $description, $application, $url, $apikey);
-    
+
     # Parameter ermitteln
-    $priority = $parameters{priority} || 0;
-    $event = $parameters{event} || '[unbenanntes Ereignis]';
-    $description = $parameters{description} || '';
-    $application = $parameters{application} || 'WireGate KNX';
-    $url = $parameters{url} || '';
-    $apikey = $parameters{apikey} || '';
+    # dom, 2012-11-05: $settings auch hier auswerten. Damit kann sendProwl() direkt aus der Logik aufgerufen werden!
+    $priority = $parameters{priority} || $settings{prowl}{priority} || 0;
+    $event = $parameters{event} || $settings{prowl}{event} || '[unbenanntes Ereignis]';
+    $description = $parameters{description} || $settings{prowl}{description} || '';
+    $application = $parameters{application} || $settings{prowl}{application} || 'WireGate KNX';
+    $url = $parameters{url} || $settings{prowl}{url} || '';
+    $apikey = $parameters{apikey} || $settings{prowl}{apikey} || '';
     
     use LWP::UserAgent;
     use URI::Escape;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.