),
+ $l->to_html($cur), '';
} elsif ($diff) {
flush_diff($ctx, \$cur);
- } else {
- # regular lines, OK
- $$rv .= $l->to_html($cur);
+ } else { # regular lines, OK
+ print $zfh $l->to_html($cur);
}
undef $cur; # free memory
}
}
-sub _msg_page_prepare_obuf {
+sub _msg_page_prepare {
my ($eml, $ctx) = @_;
my $have_over = !!$ctx->{ibx}->over;
- my $obfs_ibx = $ctx->{-obfs_ibx};
- $ctx->{obuf} = \(my $rv = '');
my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
@@ -667,81 +637,85 @@ sub _msg_page_prepare_obuf {
warn "W: BUG? @$mids not deduplicated properly\n";
return;
}
- $rv .=
+ $ctx->{-html_tip} =
"WARNING: multiple messages have this Message-ID\n
";
} else {
$ctx->{first_hdr} = $eml->header_obj;
$ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
- $rv .= ""; # anchor for body start
+ $ctx->{-html_tip} = ""; # anchor for body start
}
$ctx->{-upfx} = '../';
my @title; # (Subject[0], From[0])
+ my $hbuf = '';
for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
- $v = ascii_html($v);
- $title[1] //= ascii_html(join(', ', @n));
- if ($obfs_ibx) {
- obfuscate_addrs($obfs_ibx, $v);
- obfuscate_addrs($obfs_ibx, $title[1]);
- }
- $rv .= "From: $v\n" if $v ne '';
+ $title[1] //= join(', ', @n);
+ $hbuf .= "From: $v\n" if $v ne '';
}
- foreach my $h (qw(To Cc)) {
+ for my $h (qw(To Cc)) {
for my $v ($eml->header($h)) {
fold_addresses($v);
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "$h: $v\n" if $v ne '';
+ $hbuf .= "$h: $v\n" if $v ne '';
}
}
my @subj = $eml->header('Subject');
- if (@subj) {
- my $v = ascii_html(shift @subj);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= 'Subject: ';
- $rv .= $have_over ? qq($v\n) : "$v\n";
- $title[0] = $v;
- for $v (@subj) { # multi-Subject message :<
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "Subject: $v\n";
- }
- } else { # dummy anchor for thread skeleton at bottom of page
- $rv .= qq() if $have_over;
- $title[0] = '(no subject)';
- }
- for my $v ($eml->header('Date')) {
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
- $rv .= qq{Date: $v\n};
+ $hbuf .= "Subject: $_\n" for @subj;
+ $title[0] = $subj[0] // '(no subject)';
+ $hbuf .= "Date: $_\n" for $eml->header('Date');
+ $hbuf = ascii_html($hbuf);
+ $ctx->{-title_html} = ascii_html(join(' - ', @title));
+ if (my $obfs_ibx = $ctx->{-obfs_ibx}) {
+ obfuscate_addrs($obfs_ibx, $hbuf);
+ obfuscate_addrs($obfs_ibx, $ctx->{-title_html});
}
+
# [thread overview] link is typically added after Date,
# but added after Subject, or even nothing.
if ($have_over) {
- chop $rv; # drop "\n", or noop if $rv eq ''
- $rv .= qq{\t[thread overview]\n};
+ chop $hbuf; # drop "\n", or noop if $rv eq ''
+ $hbuf .= qq{\t[thread overview]\n};
+ $hbuf =~ s!^Subject:\x20(.*?)(\n[A-Z]|\z)
+ !Subject: $1$2!msx or
+ $hbuf .= qq();
+ }
+ if (scalar(@$mids) == 1) { # common case
+ my $x = ascii_html($mids->[0]);
+ $hbuf .= qq[Message-ID: <$x> (raw)\n];
}
if (!$nr) { # first (and only) message, common case
- $ctx->{-title_html} = join(' - ', @title);
- $rv = $ctx->html_top . $rv;
+ print { $ctx->zfh } $ctx->html_top, $hbuf;
+ } else {
+ delete $ctx->{-title_html};
+ print { $ctx->zfh } $ctx->{-html_tip}, $hbuf;
}
-
$ctx->{-linkify} //= PublicInbox::Linkify->new;
- if (scalar(@$mids) == 1) { # common case
- my $mhtml = ascii_html($mids->[0]);
- $rv .= qq[Message-ID: <$mhtml> (raw)\n];
- } else {
+ $hbuf = '';
+ if (scalar(@$mids) != 1) { # unlikely, but it happens :<
# X-Alt-Message-ID can happen if a message is injected from
# public-inbox-nntpd because of multiple Message-ID headers.
- my $s = '';
for my $h (qw(Message-ID X-Alt-Message-ID)) {
- $s .= "$h: $_\n" for ($eml->header_raw($h));
+ $hbuf .= "$h: $_\n" for ($eml->header_raw($h));
}
- $ctx->{-linkify}->linkify_mids('..', \$s, 1);
- $rv .= $s;
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML
+ print { $ctx->{zfh} } $hbuf;
+ $hbuf = '';
}
- _parent_headers($ctx, $eml);
- $rv .= "\n";
+ my @irt = $eml->header_raw('In-Reply-To');
+ my $refs;
+ if (!@irt) {
+ $refs = references($eml);
+ $irt[0] = pop(@$refs) if scalar @$refs;
+ }
+ $hbuf .= "In-Reply-To: $_\n" for @irt;
+
+ # do not display References: if search is present,
+ # we show the thread skeleton at the bottom, instead.
+ if (!$have_over) {
+ $refs //= references($eml);
+ $hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs;
+ }
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML
+ say { $ctx->{zfh} } $hbuf;
1;
}
@@ -791,43 +765,12 @@ sub thread_skel ($$$) {
$ctx->{parent_msg} = $parent;
}
-sub _parent_headers {
- my ($ctx, $hdr) = @_;
- my @irt = $hdr->header_raw('In-Reply-To');
- my $refs;
- if (@irt) {
- my $s = '';
- $s .= "In-Reply-To: $_\n" for @irt;
- $ctx->{-linkify}->linkify_mids('..', \$s);
- ${$ctx->{obuf}} .= $s;
- } else {
- $refs = references($hdr);
- my $irt = pop @$refs;
- if (defined $irt) {
- my $html = ascii_html($irt);
- my $href = mid_href($irt);
- ${$ctx->{obuf}} .= <$html>
-EOM
- }
- }
-
- # do not display References: if search is present,
- # we show the thread skeleton at the bottom, instead.
- return if $ctx->{ibx}->over;
-
- $refs //= references($hdr);
- if (@$refs) {
- $_ = linkify_ref_no_over($_) for @$refs;
- ${$ctx->{obuf}} .= 'References: '. join("\n\t", @$refs) . "\n";
- }
-}
-
-# appends to obuf
+# writes to zbuf
sub html_footer {
my ($ctx, $hdr) = @_;
my $upfx = '../';
- my ($related, $skel);
+ my (@related, $skel);
+ my $foot = '';
my $qry = delete $ctx->{-qry};
if ($qry && $ctx->{ibx}->isrch) {
my $q = ''; # search for either ancestor or descendent patches
@@ -841,7 +784,7 @@ sub html_footer {
$q = wrap('', '', $q);
my $rows = ($q =~ tr/\n/\n/) + 1;
$q = ascii_html($q);
- $related = <find likely ancestor, descendant, or conflicting patches for {ibx}->over) {
my $t = ts2str($ctx->{-t_max});
my $t_fmt = fmt_ts($ctx->{-t_max});
- my $fallback = $related ? "\t" : "\t";
+ my $fallback = @related ? "\t" : "\t";
$skel = <~$t_fmt UTC|newest]
EOF
-
thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
@@ -868,44 +810,32 @@ EOF
if (my $n = $ctx->{next_msg}) {
$n = mid_href($n);
- $next = "next";
+ $next = qq(next);
}
- my $u;
my $par = $ctx->{parent_msg};
- if ($par) {
- $u = mid_href($par);
- $u = "$upfx$u/";
- }
+ my $u = $par ? $upfx.mid_href($par).'/' : undef;
if (my $p = $ctx->{prev_msg}) {
$prev = mid_href($p);
if ($p && $par && $p eq $par) {
- $prev = "prev parent';
$parent = '';
} else {
- $prev = "prev';
- $parent = " parent" if $u;
+ $parent = qq( parent) if $u;
}
} elsif ($u) { # unlikely
- $parent = " parent";
+ $parent = qq( parent);
}
- ${$ctx->{obuf}} .= "$next $prev$parent ";
+ $foot .= "$next $prev$parent ";
} else { # unindexed inboxes w/o over
- ${$ctx->{obuf}} .= '';
$skel = qq( latest);
}
- ${$ctx->{obuf}} .= qq(reply);
- # $skel may be big for big threads, don't append it to obuf
- $skel .= '
' . ($related // '');
- $ctx->zmore($skel .= msg_reply($ctx, $hdr)); # flushes obuf
-}
-
-sub linkify_ref_no_over {
- my ($mid) = @_;
- my $href = mid_href($mid);
- my $html = ascii_html($mid);
- "<$html>";
+ # $skel may be big for big threads, don't append it to $foot
+ print { $ctx->zfh } $foot, qq(reply),
+ $skel, '', @related,
+ msg_reply($ctx, $hdr);
}
sub ghost_parent {