[freeside-commits] freeside/FS/FS/part_pkg voip_cdr.pm, 1.3.2.17, 1.3.2.18

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv18508

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	voip_cdr.pm 
Log Message:
just give up and try again tommorow, "1011" came from us not the CDRs anyway, RT#3985

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.3.2.17
retrieving revision 1.3.2.18
diff -u -d -r1.3.2.17 -r1.3.2.18
--- voip_cdr.pm	12 Sep 2008 22:48:20 -0000	1.3.2.17
+++ voip_cdr.pm	12 Sep 2008 22:53:56 -0000	1.3.2.18
@@ -79,7 +79,7 @@
 #                                    'type' => 'checkbox',
 #                                  },
 
-    'international_prefix' => { 'name'    => 'Destination prefix(es) for international CDR records.  Separate multiple options with commas.',
+    'international_prefix' => { 'name'    => 'Destination prefix for international CDR records',
                                 'default' => '011',
                               },
 
@@ -219,23 +219,13 @@
 #          $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
 
           my $intl = $self->option('international_prefix') || '011';
-          my @intl = ();
-          if ( $intl =~ /,/ ) {
-            @intl = split(/\s*,\s*/, $intl);
-          } else {
-            @intl = ($intl);
-          }
 
           #determine the country code
-          my $intl_match = 0;
-          foreach my $i (@intl) {
-            if ( $number =~ /^$i(((\d)(\d))(\d))(\d+)$/ ) {
-              $intl_match++;
-              last;
-            }
-          }
           my $countrycode;
-          if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
+          if (    $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
+               || $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