X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=maps%2Fbin%2Fdisplay.cgi;h=0a0cfcd9ca38fbecc7ffff3232a7c942373d0fbd;hb=7c5076668edce6b5650d075701b59ab710677e3d;hp=21f47b45da42de1296e478fd3b8d5cb01f938b27;hpb=020a4a5ea2be725b155cae3a2cadc9aba3911b9b;p=clearscm.git diff --git a/maps/bin/display.cgi b/maps/bin/display.cgi index 21f47b4..0a0cfcd 100755 --- a/maps/bin/display.cgi +++ b/maps/bin/display.cgi @@ -2,7 +2,7 @@ ################################################################################ # # File: $RCSfile: display.cgi,v $ -# Revision: $Revision: 1.1 $ +# Revision: $Revision: 1.1 $ # Description: Displays an email message # Author: Andrew@DeFaria.com # Created: Fri Nov 29 14:17:21 2002 @@ -16,9 +16,10 @@ use strict; use warnings; use FindBin; -$0 = $FindBin::Script; +local $0 = $FindBin::Script; -use lib $FindBin::Bin; +use lib "$FindBin::Bin/../lib"; +use lib "$FindBin::Bin/../../lib"; use MAPS; use MAPSWeb; @@ -30,19 +31,24 @@ use MIME::Parser; use MIME::Base64; use MIME::Words qw(:all); -my $userid = cookie ("MAPSUser"); -my $sender = param ("sender"); -my $msg_nbr = param ("msg_nbr"); -my $table_name = "message"; +my $userid = cookie('MAPSUser'); +my $sender = param('sender'); -sub ParseEmail (@) { +# CGI will replace '+' with ' ', which many mailers are starting to do, +# so add it back +$sender =~ s/ /\+/; + +my $msg_date = param('msg_date'); +my $table_name = 'message'; + +sub ParseEmail(@) { my (@header) = @_; my %header; # First output the header information. Note we'll skip uninteresting stuff - foreach (@header) { - last if ($_ eq "" || $_ eq "\cM"); + for (@header) { + last if ($_ eq '' || $_ eq "\cM"); # Escape "<" and ">" s/\\<\;/; @@ -56,115 +62,147 @@ sub ParseEmail (@) { $header{date} = $1; } elsif (/^To:\s*(.*)/i) { $header{to} = $1; + } elsif (/^Content-Transfer-Encoding: base64/) { + $header{base64} = 1; } # if - } # while + } # for return %header; } # ParseEmail -sub Body ($) { - my ($count) = @_; - - $count ||= 1; - - my $handle = FindEmail $sender; +sub Body($) { + my ($date) = @_; - my ($userid, $sender, $subject, $timestamp, $message); + # Find unique message using $date + my ($err, $msg) = FindEmail( + userid => $userid, + sender => $sender, + timestamp => $date, + ); - # Need to handle multiple messages - for (my $i = 0; $i < $count; $i++) { - ($userid, $sender, $subject, $timestamp, $message) = GetEmail $handle; - } # for + my $rec = GetEmail; - my $parser = new MIME::Parser; + my $parser = MIME::Parser->new(); - $parser->output_to_core (1); + # For some strange reason MIME::Parser has started having some problems + # with writing out tmp files... + $parser->output_to_core(1); + $parser->tmp_to_core(1); - my $entity = $parser->parse_data ($message); + my $entity = $parser->parse_data($rec->{data}); my %header = ParseEmail @{($entity->header)[0]}; print p . "\n"; - print start_table ({-align => "center", - -id => $table_name, - -border => 0, - -cellspacing => 0, - -cellpadding => 0, - -width => "100%"}); - print start_table ({-align => "center", - -bgcolor => "#d4d0c8", - -border => 0, - -cellspacing => 2, - -cellpadding => 2, - -width => "100%"}) . "\n"; + print start_table ({-align => "center", + -id => $table_name, + -border => 0, + -cellspacing => 0, + -cellpadding => 0, + -width => "100%"}); + print start_table ({-align => "center", + -bgcolor => 'steelblue', + #-bgcolor => "#d4d0c8", + -border => 0, + -cellspacing => 2, + -cellpadding => 2, + -width => "100%"}) . "\n"; print "
'; - $entity->print_body; - print ''; + if ($entity->{mail_inet_head}{mail_hdr_hash}{'Content-Transfer-Encoding'} and + ${$entity->{mail_inet_head}{mail_hdr_hash}{'Content-Transfer-Encoding'}[0]} =~ /base64/) { + print $entity->{ME_Bodyhandle}{MBS_Data}; + } else { + print '
'; + print $entity->print_body; + print ''; + } # if } else { - foreach my $part ($entity->parts) { + for my $part ($entity->parts) { # We assume here that if this part is multipart/alternative then # there exists at least one part that is text/html and we favor # that (since we're outputing to a web page anyway... if ($part->mime_type eq 'multipart/alternative') { - foreach my $subpart ($part->parts) { - if ($subpart->mime_type eq 'text/html') { - $subpart->print_body; - last; - } elsif ($subpart->mime_type eq 'multipart/related') { - # This is stupid - multipart/related? When it's really just HTML?!? - $subpart->print_body; - last; - } # if - } # foreach + for my $subpart ($part->parts) { + if ($subpart->mime_type eq 'text/html') { + # There should be an easier way to get this but I couldn't find one. + my $encoding = ${$subpart->{mail_inet_head}{mail_hdr_hash}{'Content-Transfer-Encoding'}[0]}; + if ($encoding =~ /base64/) { + $subpart->bodyhandle->print; + } else { + print $subpart->print_body; + } # if + last; + } elsif ($subpart->mime_type eq 'multipart/related') { + # This is stupid - multipart/related? When it's really just HTML?!? + $subpart->print_body; + last; + } # if + } # for + } elsif ($part->mime_type eq 'multipart/related') { + # Sometimes parts are 'multipart/relative'... + $part->print_body; } else { - if ($part->mime_type =~ /text/) { - print '
'; - $part->print_body; - print ''; - } # if + if ($part->mime_type =~ /text/) { + my $encoding = ''; + + $encoding = ${$part->{mail_inet_head}{mail_hdr_hash}{'Content-Transfer-Encoding'}[0]} + if $part->{mail_inet_head}{mail_hdr_hash}{'Content-Transfer-Encoding'}; + + if ($encoding =~ /base64/) { + $part->bodyhandle->print(); + } else { + print '
'; + print $part->print_body; + print ''; + } # if + } # if } # if - } # foreach + } # for } # if print "