use Date::Parse qw/str2time/;
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
+use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/;
use PublicInbox::MsgIter;
use PublicInbox::Address;
use PublicInbox::WwwStream;
my $mid_raw = mid_clean(mid_mime($mime));
my $id = id_compress($mid_raw, 1);
my $id_m = 'm'.$id;
- my $mid = PublicInbox::Hval->new_msgid($mid_raw);
my $root_anchor = $ctx->{root_anchor} || '';
my $irt = in_reply_to($hdr);
}
$rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
my $upfx = $ctx->{-upfx};
- my $mhref = $upfx . $mid->as_href . '/';
+ my $mhref = $upfx . mid_escape($mid_raw) . '/';
$rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
$rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
$rv .= ' '.join('; +', @tocc) . "\n" if @tocc;
my $mapping = $ctx->{mapping};
if (!$mapping && $irt) {
my $mirt = PublicInbox::Hval->new_msgid($irt);
- my $href = $upfx . $mirt->as_href . '/';
+ my $href = $upfx . $mirt->{href}. '/';
my $html = $mirt->as_html;
$rv .= qq(In-Reply-To: <<a\nhref="$href">$html</a>>\n)
}
my $nr_s = 0;
my $level = $map->[4];
my $idx = $map->[3];
- if (defined $irt) {
- my $irt_map = $mapping->{$irt};
+ my $irt_map = $mapping->{$irt} if defined $irt;
+ if (defined $irt_map) {
my $siblings = $irt_map->[0];
$nr_s = scalar(@$siblings) - 1;
$rv .= $pad . $irt_map->[1];
return index_entry($mime, $ctx, scalar @$msgs);
}
$msgs = undef;
- '</pre>'.$skel;
+ $skel;
});
}
$$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
-sub attach_link ($$$$) {
- my ($upfx, $ct, $p, $fn) = @_;
+sub attach_link ($$$$;$) {
+ my ($upfx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, @idx) = @$p;
my $nl = $idx[-1] > 1 ? "\n" : '';
my $idx = join('.', @idx);
my $size = bytes::length($part->body);
- $ct ||= 'text/plain';
- $ct =~ s/;.*//; # no attributes
+
+ # hide attributes normally, unless we want to aid users in
+ # spotting MUA problems:
+ $ct =~ s/;.*// unless $err;
$ct = ascii_html($ct);
my $desc = $part->header('Content-Description');
$desc = $fn unless defined $desc;
} else {
$sfn = 'a.bin';
}
- my @ret = qq($nl<a\nhref="$upfx$idx-$sfn">[-- Attachment #$idx: );
+ my $ret = qq($nl<a\nhref="$upfx$idx-$sfn">);
+ if ($err) {
+ $ret .=
+"[-- Warning: decoded text below may be mangled --]\n";
+ }
+ $ret .= "[-- Attachment #$idx: ";
my $ts = "Type: $ct, Size: $size bytes";
- push(@ret, ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]");
- join('', @ret, "</a>\n");
+ $ret .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
+ $ret .= "</a>\n";
}
sub add_text_body {
my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
my ($part, $depth, @idx) = @$p;
- my $ct = $part->content_type;
+ my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
- if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
+ if ($ct =~ m!\btext/x?html\b!i) {
return attach_link($upfx, $ct, $p, $fn);
}
my $s = eval { $part->body_str };
# badly-encoded message? tell the world about it!
- return attach_link($upfx, $ct, $p, $fn) if $@;
+ my $err = $@;
+ if ($err) {
+ if ($ct =~ m!\btext/plain\b!i) {
+ # Try to assume UTF-8 because Alpine seems to
+ # do wacky things and set charset=X-UNKNOWN
+ $part->charset_set('UTF-8');
+ $s = eval { $part->body_str };
+
+ # If forcing charset=UTF-8 failed,
+ # attach_link will warn further down...
+ $s = $part->body if $@;
+ } else {
+ return attach_link($upfx, $ct, $p, $fn);
+ }
+ }
my @lines = split(/^/m, $s);
$s = '';
- if (defined($fn) || $depth > 0) {
- $s .= attach_link($upfx, $ct, $p, $fn);
+ if (defined($fn) || $depth > 0 || $err) {
+ $s .= attach_link($upfx, $ct, $p, $fn, $err);
$s .= "\n";
}
my @quot;
$ctx->{-upfx} = '../';
}
my @title;
- my $mid = $hdr->header_raw('Message-ID');
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
$mid = PublicInbox::Hval->new_msgid($mid);
foreach my $h (qw(From To Cc Subject Date)) {
my $v = $hdr->header($h);
if (defined $irt) {
my $v = PublicInbox::Hval->new_msgid($irt);
my $html = $v->as_html;
- my $href = $v->as_href;
+ my $href = $v->{href};
$rv .= "In-Reply-To: <";
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
my $mid = $hdr->header_raw('Message-ID');
push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
- my $irt = uri_escape_utf8($mid);
+ my $irt = mid_escape($mid);
delete $cc{$to};
push @arg, "--to=$to";
$to = uri_escape_utf8($to);
$next = $prev = ' ';
if (my $n = $ctx->{next_msg}) {
- $n = PublicInbox::Hval->new_msgid($n)->as_href;
+ $n = PublicInbox::Hval->new_msgid($n)->{href};
$next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
}
my $u;
my $par = $ctx->{parent_msg};
if ($par) {
- $u = PublicInbox::Hval->new_msgid($par)->as_href;
+ $u = PublicInbox::Hval->new_msgid($par)->{href};
$u = "$upfx$u/";
}
if (my $p = $ctx->{prev_msg}) {
- $prev = PublicInbox::Hval->new_msgid($p)->as_href;
+ $prev = PublicInbox::Hval->new_msgid($p)->{href};
if ($p && $par && $p eq $par) {
$prev = "<a\nhref=\"$upfx$prev/\"\n" .
'rel=prev>prev parent</a>';
sub linkify_ref_nosrch {
my $v = PublicInbox::Hval->new_msgid($_[0]);
my $html = $v->as_html;
- my $href = $v->as_href;
+ my $href = $v->{href};
"<<a\nhref=\"../$href/\">$html</a>>";
}
sub ghost_parent {
my ($upfx, $mid) = @_;
- # 'subject dummy' is used internally by Mail::Thread
- return '[no common parent]' if ($mid eq 'subject dummy');
$mid = PublicInbox::Hval->new_msgid($mid);
- my $href = $mid->as_href;
+ my $href = $mid->{href};
my $html = $mid->as_html;
qq{[parent not found: <<a\nhref="$upfx$href/">$html</a>>]};
}
sub thread_results {
my ($msgs) = @_;
- require PublicInbox::Thread;
- my $th = PublicInbox::Thread->new(@$msgs);
+ require PublicInbox::SearchThread;
+ my $th = PublicInbox::SearchThread->new($msgs);
$th->thread;
$th->order(*sort_ts);
$th
$s = PublicInbox::Hval->new($s);
$s = $s->as_html;
}
- my $m = PublicInbox::Hval->new_msgid($mid);
+ my $m;
my $id = '';
my $mapping = $ctx->{mapping};
my $end = defined($s) ? "$s</a> $f\n" : "$f</a>\n";
$map->[1] = "$d<a\nhref=\"$m\">$end";
$id = "\nid=r".$id;
} else {
- $m = $ctx->{-upfx}.$m->as_href.'/';
+ $m = $ctx->{-upfx}.mid_escape($mid).'/';
}
$$dst .= $d . "<a\nhref=\"$m\"$id>" . $end;
}
my $dst = $ctx->{dst};
my $mapping = $ctx->{mapping};
my $map = $mapping->{$mid} if $mapping;
- if ($mid eq 'subject dummy') {
- my $ncp = "\t[no common parent]\n";
- $map->[1] = $ncp if $map;
- $$dst .= $ncp;
- return;
- }
my $d = $ctx->{pct} ? ' [irrelevant] ' # search result
: ' [not found] ';
$d .= indent_for($level) . th_pfx($level);
my $upfx = $ctx->{-upfx};
my $m = PublicInbox::Hval->new_msgid($mid);
- my $href = $upfx . $m->as_href . '/';
+ my $href = $upfx . $m->{href} . '/';
my $html = $m->as_html;
if ($map) {
@$topic = ();
next unless defined $top; # ghost topic
my $mid = delete $seen->{$top};
- my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ my $href = mid_escape($mid);
$top = PublicInbox::Hval->new($top)->as_html;
$ts = fmt_ts($ts);
my $sub = $ex[$i + 1];
$mid = delete $seen->{$sub};
$sub = PublicInbox::Hval->new($sub)->as_html;
- $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ $href = mid_escape($mid);
$s .= indent_for($level) . TCHILD;
$s .= "<a\nhref=\"$href/T/#u\">$sub</a>\n";
}