*ascii_html = *PublicInbox::Hval::ascii_html;
my $enc_utf8 = find_encoding('UTF-8');
-my $enc_mime = find_encoding('MIME-Header');
# public functions:
sub msg_html {
my $header_obj = $mime->header_obj;
my $mid_raw = $header_obj->header_raw('Message-ID');
- my $name = anchor_for($mid_raw);
- $seen->{$name} = "#$name"; # save the anchor for later
+ my $id = anchor_for($mid_raw);
+ $seen->{$id} = "#$id"; # save the anchor for later
my $mid = PublicInbox::Hval->new_msgid($mid_raw);
my $from = PublicInbox::Hval->new_oneline($mime->header('From'))->raw;
my $pfx = (' ' x $level);
my $ts = $mime->header('X-PI-Date');
- my $fmt = '%H:%M UTC';
- if ($now > ($ts + (365 * 24 * 60 * 60))) {
- # doesn't have to be exactly 1 year
- $fmt = '%Y/%m/%d';
- } elsif ($now > ($ts + (24 * 60 * 60))) {
- $fmt = '%m/%d';
- }
+ my $fmt = '%Y-%m-%d %H:%M UTC';
$ts = POSIX::strftime($fmt, gmtime($ts));
- $rv .= "$pfx<a\nname=\"$name\"></a>" .
- "<a\nname=\"s$midx\"></a>" .
- "<b>$subj</b>\n" .
- "$pfx<a\nhref=\"#s$next\">next</a>";
-
+ $rv .= "$pfx<b\nid=\"$id\">$subj</b>\n$pfx";
+ $rv .= "- by $from @ $ts - ";
+ $rv .= "<a\nid=\"s$midx\"\nhref=\"#s$next\">next</a>";
if ($prev >= 0) {
$rv .= "/<a\nhref=\"#s$prev\">prev</a>";
- } else {
- $rv .= ' ';
}
- $rv .= " by $from @ $ts\n\n";
+ $rv .= "\n\n";
my $irp = $header_obj->header_raw('In-Reply-To');
my ($anchor_idx, $anchor);
$mime->walk_parts(sub {
my ($part) = @_;
return if $part->subparts; # walk_parts already recurses
- my $enc = enc_for($part->content_type) || $enc_msg || $enc_utf8;
+ my $ct = $part->content_type;
+
+ # account for filter bugs...
+ return if defined $ct && $ct =~ m!\btext/[xh]+tml\b!i;
+
+ my $enc = enc_for($ct, $enc_msg);
if ($part_nr > 0) {
my $fn = $part->filename;
}
$rv .= " <a\nhref=\"$anchor\">parent</a>";
}
- $rv .= " <a\nhref=\"?r=$first#$name\">permalink</a>";
+ $rv .= " <a\nhref=\"?r=$first#$id\">threadlink</a>";
$rv . "\n\n";
}
# only private functions below.
sub enc_for {
- my ($ct) = @_;
- defined $ct or return $enc_utf8;
+ my ($ct, $default) = @_;
+ $default ||= $enc_utf8;
+ defined $ct or return $default;
my $ct_parsed = parse_content_type($ct);
if ($ct_parsed) {
if (my $charset = $ct_parsed->{attributes}->{charset}) {
return $enc if $enc;
}
}
- $enc_utf8;
+ $default;
}
sub multipart_text_as_html {
$mime->walk_parts(sub {
my ($part) = @_;
return if $part->subparts; # walk_parts already recurses
- my $enc = enc_for($part->content_type) || $enc_msg || $enc_utf8;
+ my $ct = $part->content_type;
+
+ # account for filter bugs...
+ return if defined $ct && $ct =~ m!\btext/[xh]+tml\b!i;
+
+ my $enc = enc_for($ct, $enc_msg);
if ($part_nr > 0) {
my $fn = $part->filename;
"$pad " . ascii_html($fn) . " $pad\n";
}
+my $LINK_RE = qr!\b((?:ftp|https?|nntp)://[@\w\+\&\?\.\%\;/#=-]+)!;
+
+sub linkify {
+ # no newlines added here since it'd break the splitting we do
+ # to fold quotes
+ $_[0] =~ s!$LINK_RE!<a href="$1">$1</a>!g;
+}
+
sub add_text_body_short {
my ($enc, $part, $part_nr, $full_pfx) = @_;
my $n = 0;
my $s = ascii_html($enc->decode($part->body));
+ linkify($s);
$s =~ s!^((?:(?:>[^\n]*)\n)+)!
my $cur = $1;
my @lines = split(/\n/, $cur);
my ($enc, $part, $part_nr) = @_;
my $n = 0;
my $s = ascii_html($enc->decode($part->body));
+ linkify($s);
$s =~ s!^((?:(?:>[^\n]*)\n)+)!
my $cur = $1;
my @lines = split(/\n/, $cur);
if (@lines > MAX_INLINE_QUOTED) {
- "<a\nname=q${part_nr}_" . $n++ . ">$cur</a>";
+ "<a\nid=q${part_nr}_" . $n++ . ">$cur</a>";
} else {
$cur;
}
$rv .= 'Message-ID: <' . $mid->as_html . '> ';
my $href = $mid->as_href;
$href = "../m/$href" unless $full_pfx;
- $rv .= "(<a\nhref=\"$href.txt\">original</a>)\n";
+ $rv .= "(<a\nhref=\"$href.txt\">raw</a>)\n";
}
my $irp = $header_obj->header_raw('In-Reply-To');
$to = uri_escape_utf8($to);
$subj = uri_escape_utf8($subj);
- my $cc = uri_escape_utf8(join(',', values %cc));
+ my $cc = uri_escape_utf8(join(',', sort values %cc));
my $href = "mailto:$to?In-Reply-To=$irp&Cc=${cc}&Subject=$subj";
my $idx = $standalone ? " <a\nhref=\"../\">index</a>" : '';
my ($msgid) = @_;
$msgid =~ s/\A\s*<?//;
$msgid =~ s/>?\s*\z//;
- Digest::SHA::sha1_hex($msgid);
+ 'm' . Digest::SHA::sha1_hex($msgid);
}
1;