FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

72_FRITZBOX.pm: Version 07.57.10

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28400 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jowiemann 2024-01-22 06:23:42 +00:00
parent 4e8305f2be
commit 2ff14d2db1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/72_FRITZBOX.pm
View File

@ -41,7 +41,7 @@ use warnings;
use Blocking; use Blocking;
use HttpUtils; use HttpUtils;
my $ModulVersion = "07.57.02"; my $ModulVersion = "07.57.10";
my $missingModul = ""; my $missingModul = "";
my $FRITZBOX_TR064pwd; my $FRITZBOX_TR064pwd;
my $FRITZBOX_TR064user; my $FRITZBOX_TR064user;
@ -4704,8 +4704,8 @@ sub FRITZBOX_Readout_Run_Web($)
FRITZBOX_Readout_Add_Reading ($hash, \@roReadings, "->HINWEIS", ""); FRITZBOX_Readout_Add_Reading ($hash, \@roReadings, "->HINWEIS", "");
# Ende und Rückkehr zum Hauptprozess # Ende und Rückkehr zum Hauptprozess
push @roReadings, "readoutTime", sprintf( "%.2f", time()-$startTime); push @roReadings, "readoutTime", sprintf( "%.2f", time()-$startTime);
return FRITZBOX_Readout_Response($hash, $resultData, \@roReadings, 0, $sidNew);
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->{sid} if $result->{sid}; FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->{sid} if $result->{sid};
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time(); FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time();
@ -4747,7 +4747,6 @@ sub FRITZBOX_Readout_Response($$$@)
FRITZBOX_Log $hash, 2, "" . $result->{Error}; FRITZBOX_Log $hash, 2, "" . $result->{Error};
$returnStr = "Error|" . $result->{Error}; $returnStr = "Error|" . $result->{Error};
$returnStr .= "|"; $returnStr .= "|";
} }
elsif ( defined $result->{AuthorizationRequired} ) { elsif ( defined $result->{AuthorizationRequired} ) {
@ -4759,7 +4758,7 @@ sub FRITZBOX_Readout_Response($$$@)
} }
else { else {
FRITZBOX_Log $hash, 2, "undefined situation"; FRITZBOX_Log $hash, 4, "undefined situation\n"; # . Dumper $result;
$returnStr = "Error|undefined situation"; $returnStr = "Error|undefined situation";
$returnStr .= "|"; $returnStr .= "|";
@ -5533,7 +5532,7 @@ sub FRITZBOX_Set_check_APIs($)
$apiError .= " TR064:" . $response->code; $apiError .= " TR064:" . $response->code;
# Ermitteln Box Model, FritzOS Verion, OEM aus TR064 Informationen # Ermitteln Box Model, FritzOS Version, OEM aus TR064 Informationen
if ($response->is_success && $content =~ /<modelName>/) { if ($response->is_success && $content =~ /<modelName>/) {
FRITZBOX_Log $hash, 5-$myVerbose, "TR064 returned: $content"; FRITZBOX_Log $hash, 5-$myVerbose, "TR064 returned: $content";
@ -8713,15 +8712,15 @@ sub FRITZBOX_open_Web_Connection ($)
} }
my $avmModel = InternalVal($name, "MODEL", $hash->{boxModel}); my $avmModel = InternalVal($name, "MODEL", $hash->{boxModel});
my $user = ""; my $user = AttrVal( $name, "boxUser", "" );
$user = AttrVal( $name, "boxUser", undef ) if $avmModel =~ "Box";
unless (defined $user) { if ($user eq "" && $avmModel =~ "Box") {
FRITZBOX_Log $hash, 2, "No boxUser set. Please define it (once) with 'attr $name boxUser YourBoxUser'"; FRITZBOX_Log $hash, 2, "No boxUser set. Please define it (once) with 'attr $name boxUser YourBoxUser'";
%retHash = ( "Error" => "No attr boxUser set", "ResetSID" => "1" ) ; %retHash = ( "Error" => "No attr boxUser set", "ResetSID" => "1" ) ;
return \%retHash; return \%retHash;
} }
FRITZBOX_Log $hash, 4, "Open Web connection to $host : $user"; FRITZBOX_Log $hash, 4, "Open Web connection to $host:" . $user ne "" ? $user : "user not defined";
FRITZBOX_Log $hash, 4, "getting new SID"; FRITZBOX_Log $hash, 4, "getting new SID";
$sid = (FB_doCheckPW($host, $user, $pwd)); $sid = (FB_doCheckPW($host, $user, $pwd));