X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fhttp_status.pm;h=80139e7767ab18346984a49f4ef64a2019d76653;hp=da32ec47edbd7d811b417c212ca42d749d5c8f2f;hb=e94760d804c5638ecbd1487e8c3a2797f0034846;hpb=658a793422919736368e1f0a29b0f448ef362908 diff --git a/FS/FS/part_export/http_status.pm b/FS/FS/part_export/http_status.pm index da32ec47e..80139e776 100644 --- a/FS/FS/part_export/http_status.pm +++ b/FS/FS/part_export/http_status.pm @@ -4,6 +4,7 @@ use base qw( FS::part_export ); use strict; use warnings; use vars qw( %info $DEBUG ); +use URI::Escape; use LWP::UserAgent; use HTTP::Request::Common; use Email::Valid; @@ -14,6 +15,9 @@ tie my %options, 'Tie::IxHash', 'blacklist_del_url' => { label => 'Optional blacklist delete URL', }, 'whitelist_add_url' => { label => 'Optional whitelist add URL', }, 'whitelist_del_url' => { label => 'Optional whitelist delete URL', }, + 'vacation_add_url' => { label => 'Optional vacation message add URL', }, + 'vacation_del_url' => { label => 'Optional vacation message delete URL', }, + #'user' => { label => 'Username', default=>'' }, #'password' => { label => 'Password', default => '' }, ; @@ -26,11 +30,12 @@ tie my %options, 'Tie::IxHash', 'notes' => <<'END' Fields from the service can be substituted in the URL as $field. -Optionally, spam black/whitelist addresses may be via HTTP or HTTPS as well. +Optionally, spam black/whitelist addresees and a vacation message may be +modified via HTTP or HTTPS as well. END ); -$DEBUG = 0; +$DEBUG = 1; sub rebless { shift; } @@ -39,6 +44,12 @@ our %addl_fields = ( 'svc_dsl' => [qw( gateway_access_or_phonenum ) ], ); +#some NOPs for required subroutines, to avoid throwing the exceptions in the +# part_export.pm fallbacks +sub _export_insert { '' }; +sub _export_replace { '' }; +sub _export_delete { '' }; + sub export_getstatus { my( $self, $svc_x, $htmlref, $hashref ) = @_; @@ -84,11 +95,23 @@ sub export_getstatus { my @fields = $csv->fields; my %hash = map { $_ => shift(@fields) } @header; - if ( $hash{'wb_value'} =~ /^[WA]/i ) { #Whitelist/Allow - push @{ $hashref->{'whitelist'} }, $hash{'from'}; - } else { # if ( $hash{'wb_value'} =~ /^[BD]/i ) { #Blacklist/Deny - push @{ $hashref->{'blacklist'} }, $hash{'from'}; + if ( defined $hash{'wb_value'} ) { + if ( $hash{'wb_value'} =~ /^[WA]/i ) { #Whitelist/Allow + push @{ $hashref->{'whitelist'} }, $hash{'from'}; + } else { # if ( $hash{'wb_value'} =~ /^[BD]/i ) { #Blacklist/Deny + push @{ $hashref->{'blacklist'} }, $hash{'from'}; + } } + + for (qw( created enddate )) { + $hash{$_} = '' if $hash{$_} =~ /^0000-/; + $hash{$_} = (split(' ', $hash{$_}))[0]; + } + + next unless $hash{'active'}; + $hashref->{"vacation_$_"} = $hash{$_} || '' + foreach qw( active subject body created enddate ); + } } #else { die 'guru meditation #295'; } @@ -138,6 +161,52 @@ sub export_setstatus_listX { } +sub export_setstatus_vacationadd { + my( $self, $svc_x, $hr ) = @_; + $self->export_setstatus_vacationX( $svc_x, 'add', $hr ); +} + +sub export_setstatus_vacationdel { + my( $self, $svc_x, $hr ) = @_; + $self->export_setstatus_vacationX( $svc_x, 'del', $hr ); +} + +sub export_setstatus_vacationX { + my( $self, $svc_x, $action, $hr ) = @_; + + my $option = 'vacation_'. $action. '_url'; + + my $subject = uri_escape($hr->{subject}); + my $body = uri_escape($hr->{body}); + for (qw( created enddate )) { + if ( $hr->{$_} =~ /^(\d{4}-\d{2}-\d{2})$/ ) { + $hr->{$_} = $1; + } else { + $hr->{$_} = ''; + } + } + my $created = $hr->{created}; + my $enddate = $hr->{enddate}; + + #some false laziness w/export_getstatus above + my $url; + my $urlopt = $self->option($option) or return; #DIFF + no strict 'vars'; + { + no strict 'refs'; + ${$_} = $svc_x->getfield($_) foreach $svc_x->fields; + ${$_} = $svc_x->$_() foreach @{ $addl_fields{ $svc_x->table } }; + $url = eval(qq("$urlopt")); + } + + my $req = HTTP::Request::Common::GET( $url ); + my $ua = LWP::UserAgent->new; + my $response = $ua->request($req); + + die $response->code. ' '. $response->message if $response->is_error; + +} + 1; 1;