ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some -> and test for ControlDevice so as not to give a warning

pull/4140/head^2
Isaac Connor 2025-01-05 13:12:40 -05:00
parent 833cc41b0b
commit b5ee966d90
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
View File

@ -59,9 +59,9 @@ sub open {
if ($self->{Monitor}->{ControlAddress} if ($self->{Monitor}->{ControlAddress}
and and
$self->{Monitor}{ControlAddress} ne 'user:pass@ip' $self->{Monitor}->{ControlAddress} ne 'user:pass@ip'
and and
$self->{Monitor}{ControlAddress} ne 'user:port@ip' $self->{Monitor}->{ControlAddress} ne 'user:port@ip'
) { ) {
if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) { if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
@ -70,7 +70,7 @@ sub open {
} }
my $uri = URI->new($self->{Monitor}->{ControlAddress}); my $uri = URI->new($self->{Monitor}->{ControlAddress});
$$self{realm} = 'Login to ' . $self->{Monitor}->{ControlDevice}; $$self{realm} = 'Login to ' . $self->{Monitor}->{ControlDevice} if $self->{Monitor}->{ControlDevice};
if ($self->{Monitor}->{ControlAddress}) { if ($self->{Monitor}->{ControlAddress}) {
if ( $uri->userinfo()) { if ( $uri->userinfo()) {
@$self{'username', 'password'} = $uri->userinfo() =~ /^(.*):(.*)$/; @$self{'username', 'password'} = $uri->userinfo() =~ /^(.*):(.*)$/;
@ -85,8 +85,8 @@ sub open {
$$self{base_url} = $uri->canonical(); $$self{base_url} = $uri->canonical();
Debug('Using initial credentials for '.$uri->host_port().join(',', '', @$self{'realm', 'username', 'password'}).", base_url: $$self{base_url} auth:".$uri->authority()); Debug('Using initial credentials for '.$uri->host_port().join(',', '', @$self{'realm', 'username', 'password'}).", base_url: $$self{base_url} auth:".$uri->authority());
} }
} elsif ( $self->{Monitor}{Path}) { } elsif ( $self->{Monitor}->{Path}) {
my $uri = URI->new($self->{Monitor}{Path}); my $uri = URI->new($self->{Monitor}->{Path});
Debug("Using Path for credentials: $self->{Monitor}{Path} " . $uri->userinfo()); Debug("Using Path for credentials: $self->{Monitor}{Path} " . $uri->userinfo());
if ( $uri->userinfo()) { if ( $uri->userinfo()) {
@$self{'username', 'password'} = $uri->userinfo() =~ /^(.*):(.*)$/; @$self{'username', 'password'} = $uri->userinfo() =~ /^(.*):(.*)$/;
@ -111,14 +111,10 @@ sub open {
my $url = $$self{base_url}.'cgi-bin/magicBox.cgi?action=getDeviceType'; my $url = $$self{base_url}.'cgi-bin/magicBox.cgi?action=getDeviceType';
# Detect REALM, has to be /cgi-bin/ptz.cgi because just / accepts no auth # Detect REALM, has to be /cgi-bin/ptz.cgi because just / accepts no auth
my $res = $self->get_realm($url); if ($self->get_realm($url)) {
if ( $res->is_success ) {
$self->{state} = 'open'; $self->{state} = 'open';
return !undef; return !undef;
} else { }
Error("Failed to get $url ".$res->status_line());
} # end if $res->status_line() eq '401 Unauthorized'
$self->{state} = 'closed'; $self->{state} = 'closed';
return undef; return undef;