X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMisc.pm;h=54467a1fb75eea2dca3068fa549f343819fd003d;hb=d308c191905e5d1d982e439cb83d5304650ee77a;hp=97ff8ed6121bf70a8e0739a88fa397a5e0d3e737;hpb=6d891eee72cf63362601e0823c52c6e9a4aed826;p=freeside.git diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 97ff8ed61..54467a1fb 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -5,9 +5,16 @@ use vars qw ( @ISA @EXPORT_OK $DEBUG ); use Exporter; use Carp; use Data::Dumper; +#do NOT depend on any FS:: modules here, causes weird (sometimes unreproducable +#until on client machine) dependancy loops. put them in FS::Misc::Something +#instead @ISA = qw( Exporter ); -@EXPORT_OK = qw( send_email send_fax states_hash state_label card_types ); +@EXPORT_OK = qw( send_email send_fax + states_hash counties state_label + card_types + generate_ps do_print + ); $DEBUG = 0; @@ -60,7 +67,7 @@ I - (optional) type parameter for multipart/related messages use vars qw( $conf ); use Date::Format; use Mail::Header; -use Mail::Internet 1.44; +use Mail::Internet 2.00; use MIME::Entity; use FS::UID; @@ -186,34 +193,51 @@ sub send_email { } #this kludges a "mysmtpsend" method into Mail::Internet for send_email above +#now updated for MailTools v2! package Mail::Internet; use Mail::Address; use Net::SMTP; - -sub Mail::Internet::mysmtpsend { - my $src = shift; - my %opt = @_; - my $host = $opt{Host}; - my $envelope = $opt{MailFrom}; - my $noquit = 0; - my $smtp; - my @hello = defined $opt{Hello} ? (Hello => $opt{Hello}) : (); - - push(@hello, 'Port', $opt{'Port'}) - if exists $opt{'Port'}; - - push(@hello, 'Debug', $opt{'Debug'}) - if exists $opt{'Debug'}; - - if(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) { - $smtp = $host; - $noquit = 1; +use Net::Domain; + +sub Mail::Internet::mysmtpsend($@) { + my ($self, %opt) = @_; + + my $host = $opt{Host}; + my $envelope = $opt{MailFrom}; # || mailaddress(); + my $quit = 1; + + my ($smtp, @hello); + + push @hello, Hello => $opt{Hello} + if defined $opt{Hello}; + + push @hello, Port => $opt{Port} + if exists $opt{Port}; + + push @hello, Debug => $opt{Debug} + if exists $opt{Debug}; + +# if(!defined $host) +# { local $SIG{__DIE__}; +# my @hosts = qw(mailhost localhost); +# unshift @hosts, split /\:/, $ENV{SMTPHOSTS} +# if defined $ENV{SMTPHOSTS}; +# +# foreach $host (@hosts) +# { $smtp = eval { Net::SMTP->new($host, @hello) }; +# last if defined $smtp; +# } +# } +# elsif(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) + if(ref($host) && UNIVERSAL::isa($host,'Net::SMTP')) + { $smtp = $host; + $quit = 0; } - else { - #local $SIG{__DIE__}; - #$smtp = eval { Net::SMTP->new($host, @hello) }; - $smtp = new Net::SMTP $host, @hello; + else + { #local $SIG{__DIE__}; + #$smtp = eval { Net::SMTP->new($host, @hello) }; + $smtp = Net::SMTP->new($host, @hello); } unless ( defined($smtp) ) { @@ -222,39 +246,35 @@ sub Mail::Internet::mysmtpsend { return "can't connect to $host: $err" } - my $hdr = $src->head->dup; + my $head = $self->cleaned_header_dup; - _prephdr($hdr); + $head->delete('Bcc'); # Who is it to - my @rcpt = map { ref($_) ? @$_ : $_ } grep { defined } @opt{'To','Cc','Bcc'}; - @rcpt = map { $hdr->get($_) } qw(To Cc Bcc) - unless @rcpt; - my @addr = map($_->address, Mail::Address->parse(@rcpt)); + my @rcpt = map { ref $_ ? @$_ : $_ } grep { defined } @opt{'To','Cc','Bcc'}; + @rcpt = map { $head->get($_) } qw(To Cc Bcc) + unless @rcpt; + my @addr = map {$_->address} Mail::Address->parse(@rcpt); + #@addr or return (); return 'No valid destination addresses found!' unless(@addr); - $hdr->delete('Bcc'); # Remove blind Cc's - # Send it - #warn "Headers: \n" . join('',@{$hdr->header}); - #warn "Body: \n" . join('',@{$src->body}); - - my $ok = $smtp->mail( $envelope ) && - $smtp->to(@addr) && - $smtp->data(join("", @{$hdr->header},"\n",@{$src->body})); + my $ok = $smtp->mail($envelope) + && $smtp->to(@addr) + && $smtp->data(join("", @{$head->header}, "\n", @{$self->body})); + #$quit && $smtp->quit; + #$ok ? @addr : (); if ( $ok ) { - $smtp->quit - unless $noquit; + $quit && $smtp->quit; return ''; } else { return $smtp->code. ' '. $smtp->message; } - } package FS::Misc; #eokludge @@ -301,7 +321,7 @@ sub send_fax { unless exists($options{'dialstring'}); if (exists($options{'docdata'}) and ref($options{'docdata'}) eq 'ARRAY') { - my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc; + my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc; my $fh = new File::Temp( TEMPLATE => 'faxdoc.'. $options{'dialstring'} . '.XXXXXXXX', DIR => $dir, @@ -359,13 +379,12 @@ sub states_hash { # sort map { s/[\n\r]//g; $_; } map { $_->state; } - qsearch({ - 'select' => 'state', - 'table' => 'cust_main_county', - 'hashref' => { 'country' => $country }, - 'extra_sql' => 'GROUP BY state', - }) - ; + qsearch({ + 'select' => 'state', + 'table' => 'cust_main_county', + 'hashref' => { 'country' => $country }, + 'extra_sql' => 'GROUP BY state', + }); #it could throw a fatal "Invalid country code" error (for example "AX") my $subcountry = eval { new Locale::SubCountry($country) } @@ -378,6 +397,26 @@ sub states_hash { @states; } +=item counties STATE COUNTRY + +Returns a list of counties for this state and country. + +=cut + +sub counties { + my( $state, $country ) = @_; + + sort map { s/[\n\r]//g; $_; } + map { $_->county } + qsearch({ + 'select' => 'DISTINCT county', + 'table' => 'cust_main_county', + 'hashref' => { 'state' => $state, + 'country' => $country, + }, + }); +} + =item state_label STATE COUNTRY_OR_LOCALE_SUBCOUNRY_OBJECT =cut @@ -409,7 +448,7 @@ sub state_label { Returns a hash reference of the accepted credit card types. Keys are shorter identifiers and values are the longer strings used by the system (see -L). =cut @@ -446,6 +485,80 @@ sub card_types { \%card_types; } +=item generate_ps FILENAME + +Returns an postscript rendition of the LaTex file, as a scalar. +FILENAME does not contain the .tex suffix and is unlinked by this function. + +=cut + +use String::ShellQuote; + +sub generate_ps { + my $file = shift; + + my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc; + chdir($dir); + + my $sfile = shell_quote $file; + + system("pslatex $sfile.tex >/dev/null 2>&1") == 0 + or die "pslatex $file.tex failed; see $file.log for details?\n"; + system("pslatex $sfile.tex >/dev/null 2>&1") == 0 + or die "pslatex $file.tex failed; see $file.log for details?\n"; + + system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0 + or die "dvips failed"; + + open(POSTSCRIPT, "<$file.ps") + or die "can't open $file.ps: $! (error in LaTeX template?)\n"; + + unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex"); + + my $ps = ''; + + if ( $conf->exists('lpr-postscript_prefix') ) { + my $prefix = $conf->config('lpr-postscript_prefix'); + $ps .= eval qq("$prefix"); + } + + while () { + $ps .= $_; + } + + close POSTSCRIPT; + + if ( $conf->exists('lpr-postscript_suffix') ) { + my $suffix = $conf->config('lpr-postscript_suffix'); + $ps .= eval qq("$suffix"); + } + + return $ps; + +} + +=item print ARRAYREF + +Sends the lines in ARRAYREF to the printer. + +=cut + +use IPC::Run3; + +sub do_print { + my $data = shift; + + my $lpr = $conf->config('lpr'); + + my $outerr = ''; + run3 $lpr, $data, \$outerr, \$outerr; + if ( $? ) { + $outerr = ": $outerr" if length($outerr); + die "Error from $lpr (exit status ". ($?>>8). ")$outerr\n"; + } + +} + =back =head1 BUGS