From 1b27f487e341469658252a8fb7dfadc86fa03bea Mon Sep 17 00:00:00 2001
From: tupol <>
Date: Sun, 25 Feb 2018 16:33:46 +0000
Subject: [PATCH] FRITZBOX: interval during disable

git-svn-id: https://svn.fhem.de/fhem/trunk@16264 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/23_LUXTRONIK2.pm | 10 ++++++----
 fhem/FHEM/72_FRITZBOX.pm   | 16 +++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/fhem/FHEM/23_LUXTRONIK2.pm b/fhem/FHEM/23_LUXTRONIK2.pm
index baec5e3ef..6e988990f 100644
--- a/fhem/FHEM/23_LUXTRONIK2.pm
+++ b/fhem/FHEM/23_LUXTRONIK2.pm
@@ -1069,10 +1069,12 @@ LUXTRONIK2_UpdateDone($)
       }
          
       # 76 userHeatpumpParameters
-      my @userReadings = split /,/, $a[76];
-      foreach (@userReadings) {
-        my( $rName, $rValue) = split / /, $_;
-        readingsBulkUpdate($hash, $rName, $rValue);
+      if (defined $a[76]) {
+        my @userReadings = split /,/, $a[76];
+        foreach (@userReadings) {
+          my( $rName, $rValue) = split / /, $_;
+          readingsBulkUpdate($hash, $rName, $rValue);
+        }
       }
           
      readingsEndUpdate($hash,1);
diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm
index d4bf3db6e..51b0cbe46 100644
--- a/fhem/FHEM/72_FRITZBOX.pm
+++ b/fhem/FHEM/72_FRITZBOX.pm
@@ -318,7 +318,7 @@ sub FRITZBOX_Attr($@)
       }
    }
 
-   if ($aName =~ /fritzBoxIP|m3uFileLocal|m3uFileURL/ && $hash->{APICHECKED} == 1) {
+   if ( $aName =~ /fritzBoxIP|m3uFileLocal|m3uFileURL/ && $hash->{APICHECKED} == 1 || $aName eq "disable" ) {
       $hash->{APICHECKED} = 0;
       RemoveInternalTimer($hash->{helper}{TimerReadout});
       InternalTimer(gettimeofday(), "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1);
@@ -650,12 +650,14 @@ sub FRITZBOX_Readout_Start($)
    my ($timerpara) = @_;
 
    # my ( $name, $func ) = split( /\./, $timerpara );
-   my $index = rindex( $timerpara, "." );    # rechter punkt
+   my $index = rindex( $timerpara, "." );    # rechter Punkt
    my $func = substr $timerpara, $index + 1, length($timerpara);    # function extrahieren
    my $name = substr $timerpara, 0, $index;                         # name extrahieren
    my $hash = $defs{$name};
 
    my $runFn;
+   
+   my $disable = AttrVal( $name, "disable", 0 );
 
 # Set timer value (min. 60)
    $hash->{INTERVAL} = AttrVal( $name, "INTERVAL",  $hash->{INTERVAL} );
@@ -664,7 +666,7 @@ sub FRITZBOX_Readout_Start($)
    my $interval = $hash->{INTERVAL};
    
 # First run is an API check
-   unless ( $hash->{APICHECKED} ) {
+   unless ( $hash->{APICHECKED} && ! $disable ) {
       $interval = 10;
       $hash->{STATE} = "Check APIs";
       $runFn = "FRITZBOX_API_Check_Run";
@@ -678,10 +680,10 @@ sub FRITZBOX_Readout_Start($)
    if( $interval != 0 ) {
       RemoveInternalTimer($hash->{helper}{TimerReadout});
       InternalTimer(gettimeofday()+$interval, "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1);
-      if( AttrVal( $name, "disable", 0 ) == 1 ) {
-		readingsSingleUpdate( $hash, "state", "disabled", 1 );
-		return undef;
-	  }
+      if( $disable ) {
+        readingsSingleUpdate( $hash, "state", "disabled", 1 );
+        return undef;
+      }
    }
 
 # Kill running process if "set update" is used