70_ZoneMinder:fixed
git-svn-id: https://svn.fhem.de/fhem/trunk@17515 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -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};
|
||||
|
||||
Reference in New Issue
Block a user