TT#63875 faxsend relies on config.faxserver.number_rewrite_enable

* skip number normalisation in faxsend if number_rewrite_enable
      is disabled

Change-Id: If249121722751408af95d2f1348418ca1504d17b
(cherry picked from commit e862ac8446)
changes/52/33552/1
Kirill Solomko 6 years ago
parent 2a96f6ac23
commit caf3864278

@ -59,13 +59,12 @@ sub send_fax {
} else { } else {
$number = $sender; $number = $sender;
} }
{ if ($c->config->{faxserver}{number_rewrite_enable} eq 'yes') {
my ($user, $domain) = split(/\@/, $args{destination}); my ($user, $domain) = split(/\@/, $args{destination});
$user =~ s/^sips?://; $user =~ s/^sips?://;
$user = uri_unescape(NGCP::Panel::Utils::Subscriber::apply_rewrite( $user = uri_unescape(NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $subscriber, number => $user, direction => 'callee_in' c => $c, subscriber => $subscriber, number => $user, direction => 'callee_in'
)); ));
if ($user) { if ($user) {
if($domain && $domain ne $subscriber->domain->domain) { if($domain && $domain ne $subscriber->domain->domain) {
$user = $user . '@' . $domain; $user = $user . '@' . $domain;
@ -75,26 +74,26 @@ sub send_fax {
$args{destination} = $user; $args{destination} = $user;
} else { } else {
$c->log->debug('number normalization: caller_in apply_rewrite result is empty for '.$args{destination}.', billing subscriber id '.$subscriber->id.'.'); $c->log->debug('number normalization: caller_in apply_rewrite result is empty for '.$args{destination}.', billing subscriber id '.$subscriber->id.'.');
} }
} }
$sendfax_args{caller} = $number; $sendfax_args{caller} = $number;
$sendfax_args{callee} = $args{destination}; $sendfax_args{callee} = $args{destination};
if($args{quality}) {#low|medium|extended if ($args{quality}) {#low|medium|extended
$sendfax_args{quality} = $args{quality}; $sendfax_args{quality} = $args{quality};
} }
if($args{pageheader}) { if ($args{pageheader}) {
$sendfax_args{header} = $args{pageheader}; $sendfax_args{header} = $args{pageheader};
} }
$sendfax_args{files} = []; $sendfax_args{files} = [];
if($args{upload}){ if ($args{upload}){
push @{$sendfax_args{files}}, eval { $args{upload}->tempname }; push @{$sendfax_args{files}}, eval { $args{upload}->tempname };
$c->log->debug('error to retrieve tempfile of upload: ' . @_) if @_; $c->log->debug('error to retrieve tempfile of upload: ' . @_) if @_;
} }
if($args{data}){ if ($args{data}){
$sendfax_args{input} = [\$args{data}]; $sendfax_args{input} = [\$args{data}];
} }
my $client = new NGCP::Fax; my $client = new NGCP::Fax;

Loading…
Cancel
Save