X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fhttp.pm;h=c35c89f121989c3548e5a937f7b576b6d9b0bceb;hp=55d8329662a8f29ebbbb2c9eb2fd936d4dc2b399;hb=1ad547a47f16b4230762e752fbe48d460ed997e1;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2

diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
index 55d832966..c35c89f12 100644
--- a/FS/FS/part_export/http.pm
+++ b/FS/FS/part_export/http.pm
@@ -1,12 +1,10 @@
 package FS::part_export::http;
 
-use vars qw(@ISA %info);
+use base qw( FS::part_export );
+use vars qw( %options %info );
 use Tie::IxHash;
-use FS::part_export;
 
-@ISA = qw(FS::part_export);
-
-tie my %options, 'Tie::IxHash',
+tie %options, 'Tie::IxHash',
   'method' => { label   =>'Method',
                 type    =>'select',
                 #options =>[qw(POST GET)],
@@ -35,12 +33,17 @@ tie my %options, 'Tie::IxHash',
     default => join("\n",
     ),
   },
+  'success_regexp' => {
+    label  => 'Success Regexp',
+    default => '',
+  },
 ;
 
 %info = (
   'svc'     => 'svc_domain',
   'desc'    => 'Send an HTTP or HTTPS GET or POST request',
   'options' => \%options,
+  'no_machine' => 1,
   'notes'   => <<'END'
 Send an HTTP or HTTPS GET or POST to the specified URL.  For HTTPS support,
 <a href="http://search.cpan.org/dist/Crypt-SSLeay">Crypt::SSLeay</a>
@@ -66,9 +69,14 @@ sub _export_command {
 
   return unless $self->option("${action}_data");
 
+  my $cust_main = $svc_x->table eq 'cust_main'
+                    ? $svc_x
+                    : $svc_x->cust_svc->cust_pkg->cust_main;
+
   $self->http_queue( $svc_x->svcnum,
     $self->option('method'),
     $self->option('url'),
+    $self->option('success_regexp'),
     map {
       /^\s*(\S+)\s+(.*)$/ or /()()/;
       my( $field, $value_expression ) = ( $1, $2 );
@@ -85,12 +93,19 @@ sub _export_replace {
 
   return unless $self->option('replace_data');
 
-  $self->http_queue( $svc_x->svcnum,
+  my $new_cust_main = $new->table eq 'cust_main'
+                        ? $new
+                        : $new->cust_svc->cust_pkg->cust_main;
+  my $cust_main = $new_cust_main; #so folks can use $new_cust_main or $cust_main
+
+  $self->http_queue( $new->svcnum,
     $self->option('method'),
     $self->option('url'),
+    $self->option('success_regexp'),
     map {
       /^\s*(\S+)\s+(.*)$/ or /()()/;
       my( $field, $value_expression ) = ( $1, $2 );
+      my $value = eval $value_expression;
       die $@ if $@;
       ( $field, $value );
     } split(/\n/, $self->option('replace_data') )
@@ -100,15 +115,13 @@ sub _export_replace {
 
 sub http_queue {
   my($self, $svcnum) = (shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::http::http",
-  };
+  my $queue = new FS::queue { 'job' => "FS::part_export::http::http" };
+  $queue->svcnum($svcnum) if $svcnum;
   $queue->insert( @_ );
 }
 
 sub http {
-  my($method, $url, @data) = @_;
+  my($method, $url, $success_regexp, @data) = @_;
 
   $method = lc($method);
 
@@ -128,6 +141,11 @@ sub http {
 
   die $response->error_as_HTML if $response->is_error;
 
+  if(length($success_regexp) > 1) {
+    my $response_content = $response->content;
+    die $response_content unless $response_content =~ /$success_regexp/;
+  }
+
 }
 
 1;