MT#13367 fix commit 0858ef

that commit had introduced a couple of syntax errors:

Global symbol "$sub" requires explicit package name at /usr/share/perl5/NGCP/Panel/Controller/Device.pm line 1610.
Global symbol "$sub" requires explicit package name at /usr/share/perl5/NGCP/Panel/Controller/Device.pm line 1615.
Global symbol "$sub" requires explicit package name at /usr/share/perl5/NGCP/Panel/Controller/Device.pm line 1619.
Global symbol "$sub" requires explicit package name at /usr/share/perl5/NGCP/Panel/Controller/Device.pm line 1622.

Change-Id: Ie8d31fdaa60da18f73daba4983fe54ea427a9f9a
changes/15/3315/2
Andrew Pogrebennyk 10 years ago committed by Andrii Pogrebennyk
parent 0858ef8840
commit 669c0eb420

@ -1583,8 +1583,9 @@ sub dev_static_jitsi_config :Chained('/') :PathPart('device/autoprov/static/jits
return;
}
my $sub;
if($c->config->{deviceprovisioning}->{softphone_webauth}) {
my $sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->find({
$sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->find({
webusername => $user,
'domain.domain' => $domain,
webpassword => $pass,
@ -1602,6 +1603,23 @@ sub dev_static_jitsi_config :Chained('/') :PathPart('device/autoprov/static/jits
}
$user = $sub->username;
$pass = $sub->password;
} else {
$sub = $c->model('DB')->resultset('provisioning_voip_subscribers')->find({
username => $user,
'domain.domain' => $domain,
password => $pass,
},{
join => 'domain',
});
unless($sub) {
if($c->config->{features}->{debug}) {
$c->response->body("404 - sipuser authentication failed");
} else {
$c->response->body("404 - invalid user config parameters");
}
$c->response->status(404);
return;
}
}
my $jitsi_prov;

Loading…
Cancel
Save