use Params::Validate qw(validate_with :types);
use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
use Debbugs::CGI qw(:url :html :util);
+use Debbugs::Common qw(globify_scalar);
use POSIX qw(strftime);
BEGIN{
@EXPORT = ();
%EXPORT_TAGS = ();
- @EXPORT_OK = (qw(display_entities handle_record handle_email_message));
+ @EXPORT_OK = (qw(display_entity handle_record handle_email_message));
Exporter::export_ok_tags(keys %EXPORT_TAGS);
$EXPORT_TAGS{all} = [@EXPORT_OK];
}
}
);
+ $param{output} = globify_scalar($param{output});
my $entity = $param{entity};
my $ref = $param{bug_num};
my $top = $param{outer};
my $xmessage = $param{msg_num};
- if (defined ref($param{output}) and
- ref($param{output}) eq 'SCALAR' and
- not UNIVERSAL::isa($param{output},'GLOB')) {
- $param{output} = IO::Scalar->new($param{output});
- }
my $attachments = $param{attachments};
my $head = $entity->head;
$filename = '' unless defined $filename;
$filename = decode_rfc1522($filename);
- if ($top and not $param{terse}) {
+ if ($param{outer} and
+ not $param{terse} and
+ not exists $param{att}) {
my $header = $entity->head;
print {$param{output}} "<pre class=\"headers\">\n";
if ($param{trim_headers}) {
print {$param{output}} "</pre>\n";
}
- unless (($top and $type =~ m[^text(?:/plain)?(?:;|$)]) or
- ($type =~ m[^multipart/])) {
- push @$attachments, $entity;
- my @dlargs = ($ref, msg=>$xmessage, att=>$#$attachments);
- push @dlargs, (filename=>$filename) if $filename ne '';
- my $printname = $filename;
- $printname = 'Message part ' . ($#$attachments + 1) if $filename eq '';
- print {$param{output}} '<pre class="mime">[<a href="' . html_escape(bug_url(@dlargs)) . qq{">$printname</a> } .
- "($type, $disposition)]</pre>\n";
-
- if (exists $param{msg} and exists $param{att} and
+ if (not (($param{outer} and $type =~ m{^text(?:/plain)?(?:;|$)})
+ or $type =~ m{^multipart/}
+ )) {
+ push @$attachments, $param{entity};
+ # output this attachment
+ if (exists $param{att} and
$param{att} == $#$attachments) {
my $head = $entity->head;
chomp(my $type = $entity->effective_type);
}
print {$param{output}} "\n";
my $decoder = MIME::Decoder->new($head->mime_encoding);
- $decoder->decode(new IO::Scalar(\$body), \*STDOUT);
- exit(0);
+ $decoder->decode(IO::Scalar->new(\$body), $param{output});
+ return;
+ }
+ elsif (not exists $param{att}) {
+ my @dlargs = (msg=>$xmessage, att=>$#$attachments);
+ push @dlargs, (filename=>$filename) if $filename ne '';
+ my $printname = $filename;
+ $printname = 'Message part ' . ($#$attachments + 1) if $filename eq '';
+ print {$param{output}} '<pre class="mime">[<a href="' .
+ html_escape(bug_links(bug => $ref,
+ links_only => 1,
+ options => {@dlargs})
+ ) . qq{">$printname</a> } .
+ "($type, $disposition)]</pre>\n";
}
}
- return if not $top and $disposition eq 'attachment' and not defined($param{att});
+ return if not $param{outer} and $disposition eq 'attachment' and not exists $param{att};
return unless ($type =~ m[^text/?] and
$type !~ m[^text/(?:html|enriched)(?:;|$)]) or
$type =~ m[^application/pgp(?:;|$)] or
attachments => $attachments,
terse => $param{terse},
exists $param{msg}?(msg=>$param{msg}):(),
- exists $param{attachment}?(attachment=>$param{attachment}):(),
+ exists $param{att}?(att=>$param{att}):(),
);
- print {$param{output}} "\n";
+ # print {$param{output}} "\n";
}
} elsif ($entity->parts) {
# We must be dealing with a nested message.
- print {$param{output}} "<blockquote>\n";
+ if (not exists $param{att}) {
+ print {$param{output}} "<blockquote>\n";
+ }
my @parts = $entity->parts;
foreach my $part (@parts) {
display_entity(entity => $part,
bug_num => $ref,
outer => 1,
msg_num => $xmessage,
- ouput => $param{output},
+ output => $param{output},
attachments => $attachments,
terse => $param{terse},
exists $param{msg}?(msg=>$param{msg}):(),
- exists $param{attachment}?(attachment=>$param{attachment}):(),
+ exists $param{att}?(att=>$param{att}):(),
);
- print {$param{output}} "\n";
+ # print {$param{output}} "\n";
}
- print {$param{output}} "</blockquote>\n";
+ if (not exists $param{att}) {
+ print {$param{output}} "</blockquote>\n";
+ }
} elsif (not $param{terse}) {
my $content_type = $entity->head->get('Content-Type:') || "text/html";
my ($charset) = $content_type =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
$body =~ s[(closes:\s*(?:bug)?\#?\s?\d+(?:,?\s*(?:bug)?\#?\s?\d+)*)]
[my $temp = $1;
$temp =~ s{(\d+)}
- {qq(<a href=").
- html_escape(bug_url($1)).
- qq(">$1</a>)
- }ge;
+ {bug_links(bug=>$1)}ge;
$temp;]gxie;
- print {$param{output}} qq(<pre class="message">$body</pre>\n);
+
+ if (not exists $param{att}) {
+ print {$param{output}} qq(<pre class="message">$body</pre>\n);
+ }
}
}
my ($email,%param) = @_;
my $output = '';
- my $parser = new MIME::Parser;
+ my $parser = MIME::Parser->new();
# Because we are using memory, not tempfiles, there's no need to
# clean up here like in Debbugs::MIME
$parser->tmp_to_core(1);
attachments => \@attachments,
terse => $param{terse},
exists $param{msg}?(msg=>$param{msg}):(),
- exists $param{att}?(attachment=>$param{att}):(),
+ exists $param{att}?(att=>$param{att}):(),
+ exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
);
return $output;
local $_ = $record->{type};
if (/html/) {
my ($time) = $record->{text} =~ /<!--\s+time:(\d+)\s+-->/;
- my $class = $record->{text} =~ /^<strong>(?:Acknowledgement|Reply|Information|Report|Notification)/ ? 'infmessage':'msgreceived';
+ my $class = $record->{text} =~ /^<strong>(?:Acknowledgement|Reply|Information|Report|Notification)/m ? 'infmessage':'msgreceived';
$output .= decode_rfc1522($record->{text});
# Link to forwarded http:// urls in the midst of the report
# (even though these links already exist at the top)
$output =~ s,((?:ftp|http|https)://[\S~-]+?/?)([\)\'\:\.\,]?(?:\s|\.<|$)),<a href=\"$1\">$1</a>$2,go;
# Add links to the cloned bugs
- $output =~ s{(Bug )(\d+)( cloned as bugs? )(\d+)(?:\-(\d+)|)}{$1.bug_links(bug=>$2).$3.bug_links(bug=>[$4..$5])}eo;
+ $output =~ s{(Bug )(\d+)( cloned as bugs? )(\d+)(?:\-(\d+)|)}{$1.bug_links(bug=>$2).$3.bug_links(bug=>(defined $5)?[$4..$5]:$4)}eo;
# Add links to merged bugs
$output =~ s{(?<=Merged )([\d\s]+)(?=\.)}{join(' ',map {bug_links(bug=>$_)} (split /\s+/, $1))}eo;
# Add links to blocked bugs
if (defined $time) {
$output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
}
- $output .= '<a href="' . html_escape(bug_url($bug_number, msg => ($msg_number+1))) . '">Full text</a> and <a href="' .
- html_escape(bug_url($bug_number, msg => ($msg_number+1), mbox => 'yes')) . '">rfc822 format</a> available.';
+ $output .= '<a href="' .
+ html_escape(bug_links(bug => $bug_number,
+ options => {msg => ($msg_number+1)},
+ links_only => 1,
+ )
+ ) . '">Full text</a> and <a href="' .
+ html_escape(bug_links(bug => $bug_number,
+ options => {msg => ($msg_number+1),
+ mbox => 'yes'},
+ links_only => 1)
+ ) . '">rfc822 format</a> available.';
$output = qq(<div class="$class"><hr>\n<a name="$msg_number"></a>\n) . $output . "</div>\n";
}
$$seen_msg_ids{$msg_id} = 1;
}
$output .= qq(<hr><p class="msgreceived"><a name="$msg_number"></a>\n);
- $output .= 'View this message in <a href="' . html_escape(bug_url($bug_number, msg=>$msg_number, mbox=>'yes')) . '">rfc822 format</a></p>';
+ $output .= 'View this message in <a href="' . html_escape(bug_links(bug=>$bug_number, links_only => 1, options=>{msg=>$msg_number, mbox=>'yes'})) . '">rfc822 format</a></p>';
$output .= handle_email_message($record->{text},
ref => $bug_number,
msg_num => $msg_number,
my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
$output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message #$msg_number</a> received at |.
html_escape("$received\@$hostname") .
- q| (<a href="| . html_escape(bug_url($bug_number, msg=>$msg_number)) . '">full text</a>'.
- q|, <a href="| . html_escape(bug_url($bug_number, msg=>$msg_number,mbox=>'yes')) .'">mbox</a>)'.":</p>\n";
+ q| (<a href="| . html_escape(bug_links(bug => $bug_number, links_only => 1, options => {msg=>$msg_number})) . '">full text</a>'.
+ q|, <a href="| . html_escape(bug_links(bug => $bug_number,
+ links_only => 1,
+ options => {msg=>$msg_number,
+ mbox=>'yes'}
+ )
+ ) .'">mbox</a>)'.":</p>\n";
$output .= handle_email_message($record->{text},
ref => $bug_number,
msg_num => $msg_number,