diff --git a/fhem/CHANGED b/fhem/CHANGED index 05a5332cd..745f89068 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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. + - bugfix: FB_CALLMONITOR regognize "user:" as login prompt for + remote telnet connection (phonebook) - changed: 73_km200.pm: DoNotPoll includes top-down hierarchy - bugfix : 73_km200.pm: Correction of commandref - entry - changed: 98_Text2Speech (thanks to TeeVau): diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm index 0ef4b51a3..41428031f 100755 --- a/fhem/FHEM/72_FB_CALLMONITOR.pm +++ b/fhem/FHEM/72_FB_CALLMONITOR.pm @@ -858,7 +858,7 @@ sub FB_CALLMONITOR_readRemotePhonebook($;$) Log3 $name, 4, "FB_CALLMONITOR ($name) - connected to FritzBox via telnet"; - my ($prematch, $match) = $telnet->waitfor('/(?:login|password):\s*$/i'); + my ($prematch, $match) = $telnet->waitfor('/(?:login|user|password):\s*$/i'); unless(defined($prematch) and defined($match)) { @@ -866,7 +866,7 @@ sub FB_CALLMONITOR_readRemotePhonebook($;$) return "Couldn't recognize login prompt: ".$telnet->errmsg; } - if($match =~ /login/ and defined($fb_user)) + if($match =~ /(login|user):/ and defined($fb_user)) { Log3 $name, 4, "FB_CALLMONITOR ($name) - setting user to FritzBox: $fb_user"; $telnet->print($fb_user); @@ -876,12 +876,12 @@ sub FB_CALLMONITOR_readRemotePhonebook($;$) return "Error giving password to FritzBox: ".$telnet->errmsg; } } - elsif($match =~ /login/ and not defined($fb_user)) + elsif($match =~ /(login|user):/ and not defined($fb_user)) { $telnet->close; return "FritzBox needs a username to login via telnet. Please provide a valid username/password combination"; } - elsif($match =~ /password/) + elsif($match =~ /password:/) { Log3 $name, 4, "FB_CALLMONITOR ($name) - giving password to FritzBox"; $telnet->print($fb_pw);