From: ivan <ivan>
Date: Fri, 12 Sep 2008 22:38:01 +0000 (+0000)
Subject: not enough sleep to support multiple internal_prefixen, RT#3985
X-Git-Tag: root_of_webpay_support~362
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=3d2f5a9f9248bd7187ccfa5075bdc577b70dc7bc;p=freeside.git

not enough sleep to support multiple internal_prefixen, RT#3985
---

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 787f052f5..cef654021 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -285,11 +285,11 @@ sub calc_recur {
           }
 
           #determine the country code
+          my $intl_match = 0;
+          foreach (@intl) { $number =~ /^$_(((\d)(\d))(\d))(\d+)$/ and do { $intl_match++; last; }; }
+
           my $countrycode;
-          if ( ( grep { $number =~ /^$_(((\d)(\d))(\d))(\d+)$/ } @intl )
-               || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
-             )
-          {
+          if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
 
             my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
             #first look for 1 digit country code