From 6e762b78d2ca2342d9e51d4b90da2292fb9fe865 Mon Sep 17 00:00:00 2001 From: delmar Date: Fri, 12 Oct 2018 14:42:22 +0000 Subject: [PATCH] 70_ZoneMinder:fixed git-svn-id: https://svn.fhem.de/fhem/trunk@17515 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/70_ZoneMinder.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/70_ZoneMinder.pm b/fhem/FHEM/70_ZoneMinder.pm index 0a7061f11..f0ffa5a11 100755 --- a/fhem/FHEM/70_ZoneMinder.pm +++ b/fhem/FHEM/70_ZoneMinder.pm @@ -91,8 +91,6 @@ sub ZoneMinder_Define { $hash->{helper}{ZM_PASSWORD} = $a[4]; } -# Log3 $name, 3, "ZoneMinder ($name) - Define done ... module=$module, zmHost=$zmHost"; - DevIo_CloseDev($hash) if (DevIo_IsOpen($hash)); DevIo_OpenDev($hash, 0, undef); @@ -118,13 +116,13 @@ sub ZoneMinder_getZmWebUrl { #use private or public LAN for Web access? my $publicAddress = ZoneMinder_getPublicAddress($hash); my $zmHost = ''; -# Log3 $name, 0, "ZoneMinder ($name) - publicAddress: $publicAddress, usePublic: $usePublic"; + if ($publicAddress and $usePublic) { $zmHost = $publicAddress; } else { $zmHost = $hash->{helper}{ZM_HOST}; + $zmHost = "http://$zmHost"; } - $zmHost = "http://$zmHost"; $zmHost .= '/' if (not $zmHost =~ m/\/$/); my $zmWebContext = $attr{$name}{webConsoleContext};