allow empty "ac" settings and treat "ac" as a string

3.1
Daniel Tiefnig 14 years ago
parent d2aff14cd8
commit cd2c9f4626

@ -121,7 +121,7 @@ sub index : Private {
} elsif($c->request->params->{edit_cc}) { } elsif($c->request->params->{edit_cc}) {
foreach my $block (eval { @{$$blocks{number_blocks}} }) { foreach my $block (eval { @{$$blocks{number_blocks}} }) {
if($$block{cc} == $c->stash->{edit_cc} if($$block{cc} == $c->stash->{edit_cc}
and $$block{ac} == $c->stash->{edit_ac} and $$block{ac} eq $c->stash->{edit_ac}
and $$block{sn_prefix} eq $c->stash->{edit_sn_prefix}) and $$block{sn_prefix} eq $c->stash->{edit_sn_prefix})
{ {
$c->stash->{erefill} = $block; $c->stash->{erefill} = $block;
@ -193,7 +193,7 @@ sub do_update_block : Local {
$settings{cc} = $c->request->params->{cc}; $settings{cc} = $c->request->params->{cc};
$settings{ac} = $c->request->params->{ac}; $settings{ac} = $c->request->params->{ac};
$settings{sn_prefix} = $c->request->params->{sn_prefix}; $settings{sn_prefix} = $c->request->params->{sn_prefix};
unless(length $settings{cc} and length $settings{ac}) { unless(length $settings{cc} and defined $settings{ac} and defined $settings{sn_prefix}) {
$c->response->redirect("/number"); $c->response->redirect("/number");
return; return;
} }
@ -238,7 +238,7 @@ sub do_delete_block : Local {
$settings{cc} = $c->request->params->{cc}; $settings{cc} = $c->request->params->{cc};
$settings{ac} = $c->request->params->{ac}; $settings{ac} = $c->request->params->{ac};
$settings{sn_prefix} = $c->request->params->{sn_prefix}; $settings{sn_prefix} = $c->request->params->{sn_prefix};
unless(length $settings{cc} and length $settings{ac}) { unless(length $settings{cc} and defined $settings{ac} and defined $settings{sn_prefix}) {
$c->response->redirect("/number"); $c->response->redirect("/number");
return; return;
} }

@ -254,9 +254,6 @@ sub update_subscriber : Local {
$settings{cc} = $cc; $settings{cc} = $cc;
$settings{ac} = $ac; $settings{ac} = $ac;
$settings{sn} = $sn; $settings{sn} = $sn;
unless(length $cc and length $ac and length $sn) {
$messages{number} = 'Client.Voip.MissingNumberPart';
} else {
my $checkresult; my $checkresult;
return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'check_cc', return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'check_cc',
$cc, \$checkresult $cc, \$checkresult
@ -273,7 +270,6 @@ sub update_subscriber : Local {
); );
$messages{number_sn} = 'Client.Voip.MalformedSn' $messages{number_sn} = 'Client.Voip.MalformedSn'
unless $checkresult; unless $checkresult;
}
} else { } else {
$settings{cc} = undef; $settings{cc} = undef;
$settings{ac} = undef; $settings{ac} = undef;

Loading…
Cancel
Save