From 5275e2742691809bcb15c4272f626c09692794f3 Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Sat, 28 Dec 2013 14:19:27 +0000
Subject: [PATCH] ENIGMA2 ONKYO_AVR: versioning

git-svn-id: https://svn.fhem.de/fhem/trunk@4490 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED              | 10 ++++++----
 fhem/FHEM/70_ENIGMA2.pm   | 15 +++++++++------
 fhem/FHEM/70_ONKYO_AVR.pm |  9 +++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 250eec9c8..7797646a3 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,8 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
 - SVN
+  - bugfix:  ENIGMA2: improved compatibility for Fritzbox and old
+  	                  Webif versions
   - feature: readingsGroup: process events only if visible in browser,
                             allow <br> for line breaks in multi-reading lines
   - feature: FLOORPLAN: Style4 (S300TH specific) now keeps its formatting
@@ -11,15 +13,15 @@
              time patches (justme1968 & Boris)
   - feature: Add new module Dashboard
   - change:  ONKYO_AVR: transfer command database into separate packet
-  			 ONKYOdb.pm
+  			            ONKYOdb.pm
   - feature: ENIGMA2: bouquet support e.g. for named channels
   - feature: Add new module ONKYO_AVR
   - feature: SYSSTAT: allow (remote) monitoring via snmp, support
              for monitoring windows systems and synology system temperature
   - feature: New module LINDY_HDMI_SWITCH.pm added
-  - feature: ENIGMA2: improved logging, default attributes for webCmd and
-             devStateIcon
-  - bugfix:  ENIGMA2: support for option channels
+  - change:  ENIGMA2: improved logging, default attributes for webCmd and
+                      devStateIcon
+  - feature: ENIGMA2: support for option channels
   - feature: mailcheck: decode non ascii subjet to utf-8, verify gpg signatures
   - feature: PRESENCE: "statusRequest" command for lan-bluetooth mode
              (collectord >= 1.4, presenced >= 1.1 required)
diff --git a/fhem/FHEM/70_ENIGMA2.pm b/fhem/FHEM/70_ENIGMA2.pm
index c3c3ff405..62294f5d8 100644
--- a/fhem/FHEM/70_ENIGMA2.pm
+++ b/fhem/FHEM/70_ENIGMA2.pm
@@ -24,7 +24,7 @@
 #     along with fhem.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Version: 1.2.0
+# Version: 1.2.1
 #
 # Major Version History:
 # - 1.2.0 - 2013-12-21
@@ -1502,7 +1502,7 @@ sub ENIGMA2_Define($$) {
 
         # use http-method POST for FritzBox environment as GET does not seem to
         # work properly. Might restrict use to newer
-        # ENIGMA2 Webif versions only.
+        # ENIGMA2 Webif versions or use of OWIF only.
         if ( exists $ENV{CONFIG_PRODUKT_NAME}
             && defined $ENV{CONFIG_PRODUKT_NAME} )
         {
@@ -1522,6 +1522,9 @@ sub ENIGMA2_Define($$) {
         $attr{$name}{devStateIcon} =
           'on:rc_GREEN:off off:rc_YELLOW:on absent:rc_STOP:on';
     }
+    unless ( exists( $attr{$name}{icon} ) ) {
+        $attr{$name}{icon} = 'dreambox';
+    }
 
     unless ( exists( $hash->{helper}{AVAILABLE} )
         and ( $hash->{helper}{AVAILABLE} == 0 ) )
@@ -1577,9 +1580,9 @@ sub ENIGMA2_SendCommand($$;$) {
         Log3 $name, 4, "ENIGMA2 $name: REQ $service";
     }
     else {
-        Log3 $name, 4, "ENIGMA2 $name: REQ $service/" . urlDecode($cmd);
         $cmd = "?" . $cmd . "&"
           if ( $http_method eq "GET" || $http_method eq "" );
+        Log3 $name, 4, "ENIGMA2 $name: REQ $service/" . urlDecode($cmd);
     }
 
     if ( defined($http_user) && defined($http_passwd) ) {
@@ -1689,14 +1692,14 @@ sub ENIGMA2_SendCommand($$;$) {
             else {
                 if ( !defined($cmd) || $cmd eq "" ) {
                     Log3 $name, 5,
-                      "ENIGMA2 $name: RES $service ERROR: not in XML format\n"
+                      "ENIGMA2 $name: RES ERROR $service - not in XML format\n"
                       . $response;
                 }
                 else {
                     Log3 $name, 5,
-                        "ENIGMA2 $name: RES $service/"
+                        "ENIGMA2 $name: RES ERROR $service/"
                       . urlDecode($cmd)
-                      . " ERROR: not in XML format\n"
+                      . " - not in XML format\n"
                       . $response;
                 }
 
diff --git a/fhem/FHEM/70_ONKYO_AVR.pm b/fhem/FHEM/70_ONKYO_AVR.pm
index affd52258..d34d2f43e 100644
--- a/fhem/FHEM/70_ONKYO_AVR.pm
+++ b/fhem/FHEM/70_ONKYO_AVR.pm
@@ -24,7 +24,7 @@
 #     along with fhem.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Version: 1.0.0
+# Version: 1.0.1
 #
 # Major Version History:
 # - 1.0.0 - 2013-12-16
@@ -200,9 +200,10 @@ sub ONKYO_AVR_GetStatus($;$) {
             }
         }
         else {
-          Log3 $name, 4, "ONKYO_AVR $name: net-receiver-information command unsupported, this must be a pre2013 device! Implicit fallback to protocol version pre2013.";
-          $hash->{helper}{receiver} = 0;
-          readingsBulkUpdate( $hash, "deviceyear", "pre2013");
+            Log3 $name, 4,
+"ONKYO_AVR $name: net-receiver-information command unsupported, this must be a pre2013 device! Implicit fallback to protocol version pre2013.";
+            $hash->{helper}{receiver} = 0;
+            readingsBulkUpdate( $hash, "deviceyear", "pre2013" );
         }
 
         # Input alias handling