From caf38642784f0313e14210860885a5a85a09ae16 Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Tue, 10 Sep 2019 16:09:56 +0200
Subject: [PATCH] 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 e862ac84465bd02298096766dc2be987b225d5d1)
---
 lib/NGCP/Panel/Utils/Fax.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/Fax.pm b/lib/NGCP/Panel/Utils/Fax.pm
index 84429ebd55..1efcb98ba8 100644
--- a/lib/NGCP/Panel/Utils/Fax.pm
+++ b/lib/NGCP/Panel/Utils/Fax.pm
@@ -59,13 +59,12 @@ sub send_fax {
     } else {
         $number = $sender;
     }
-    {
+    if ($c->config->{faxserver}{number_rewrite_enable} eq 'yes') {
         my ($user, $domain) = split(/\@/, $args{destination});
         $user =~ s/^sips?://;
         $user = uri_unescape(NGCP::Panel::Utils::Subscriber::apply_rewrite(
             c => $c, subscriber => $subscriber, number => $user, direction => 'callee_in'
         ));
-
         if ($user) {
             if($domain && $domain ne $subscriber->domain->domain) {
                 $user = $user . '@' . $domain;
@@ -75,26 +74,26 @@ sub send_fax {
             $args{destination} = $user;
 
         } 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{callee} = $args{destination};
 
-    if($args{quality}) {#low|medium|extended
+    if ($args{quality}) {#low|medium|extended
         $sendfax_args{quality} = $args{quality};
     }
-    if($args{pageheader}) {
+    if ($args{pageheader}) {
         $sendfax_args{header} = $args{pageheader};
     }
 
     $sendfax_args{files} = [];
-    if($args{upload}){
+    if ($args{upload}){
         push @{$sendfax_args{files}}, eval { $args{upload}->tempname };
         $c->log->debug('error to retrieve tempfile of upload: ' . @_) if @_;
     }
-    if($args{data}){
+    if ($args{data}){
         $sendfax_args{input} = [\$args{data}];
     }
     my $client = new NGCP::Fax;