X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=7f87462a05ccf8bbc0c1357ff1644a1a53909aa5;hb=1aef4abc1ce1a8469b7b707904993647a57ab296;hp=155090dbd02134eeea562055a2aa97e900e26d45;hpb=e91e8093159d6e309ffa47d3694faca068d7daa4;p=freeside.git

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 155090dbd..7f87462a0 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -28,10 +28,11 @@ use FS::rate_detail;
 # LRN lookup
 use LWP::UserAgent;
 use HTTP::Request::Common qw(POST);
-use Cpanel::JSON::XS qw(decode_json);
+use IO::Socket::SSL;
+use JSON::XS qw(decode_json);
 
 @ISA = qw(FS::Record);
-@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker _cdr_date_parse );
 
 $DEBUG = 0;
 $me = '[FS::cdr]';
@@ -1498,7 +1499,13 @@ sub get_lrn {
   my $self = shift;
   my $field = shift;
 
-  my $ua = LWP::UserAgent->new;
+  my $ua = LWP::UserAgent->new(
+             'ssl_opts' => {
+               verify_hostname => 0,
+               SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE,
+             },
+           );
+
   my $url = 'https://ws.freeside.biz/get_lrn';
 
   my %content = ( 'support-key' => $support_key,
@@ -1857,9 +1864,12 @@ sub process_batch_import {
 #
 # Used by FS::Upgrade to migrate to a new database.
 
+use FS::upgrade_journal;
 sub _upgrade_data {
   my ($class, %opts) = @_;
 
+  return if FS::upgrade_journal->is_done('cdr_cdrbatchnum');
+
   warn "$me upgrading $class\n" if $DEBUG;
 
   my $sth = dbh->prepare(
@@ -1887,6 +1897,8 @@ sub _upgrade_data {
     $sth->execute($cdrbatchnum{$cdrbatch}, $cdrbatch) or die $sth->errstr;
   }
 
+  FS::upgrade_journal->set_done('cdr_cdrbatchnum');
+
 }
 
 =item ip_addr_sql FIELD RANGE