use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
-sub msg_html_i {
+sub msg_page_i {
my ($nr, $ctx) = @_;
my $more = $ctx->{more};
if ($nr == 1) {
# $more cannot be true w/o $smsg being defined:
my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : '';
- $ctx->{tip} .
- multipart_text_as_html(delete $ctx->{mime}, $upfx,
- $ctx) . '</pre><hr>'
+ multipart_text_as_html(delete $ctx->{mime}, $upfx, $ctx);
+ ${delete $ctx->{obuf}} .= '</pre><hr>';
} elsif ($more) {
++$ctx->{end_nr};
# fake an EOF if {more} retrieval fails fails;
- eval { msg_html_more($ctx, $nr) };
+ eval { msg_page_more($ctx, $nr) };
} elsif ($nr == $ctx->{end_nr}) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
# public functions: (unstable)
-sub msg_html {
- my ($ctx, $mime, $smsg) = @_;
- my $ibx = $ctx->{-inbox};
- $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- my $hdr = $ctx->{hdr} = $mime->header_obj;
- $ctx->{tip} = _msg_html_prepare($hdr, $ctx, 0);
- $ctx->{end_nr} = 2;
- $ctx->{smsg} = $smsg;
- $ctx->{mime} = $mime;
- PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i);
-}
-
sub msg_page {
my ($ctx) = @_;
my $mid = $ctx->{mid};
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
- msg_html($ctx, PublicInbox::MIME->new($first), $smsg);
+ my $mime = $ctx->{mime} = PublicInbox::MIME->new($first);
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ my $hdr = $ctx->{hdr} = $mime->header_obj;
+ _msg_page_prepare_obuf($hdr, $ctx, 0);
+ $ctx->{end_nr} = 2;
+ $ctx->{smsg} = $smsg;
+ PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
}
-sub msg_html_more {
+sub msg_page_more {
my ($ctx, $nr) = @_;
my ($id, $prev, $smsg) = @{$ctx->{more}};
my $ibx = $ctx->{-inbox};
return '' unless $smsg;
my $upfx = '../' . mid_escape($smsg->mid) . '/';
my $mime = delete $smsg->{mime};
- _msg_html_prepare($mime->header_obj, $ctx, $nr) .
- multipart_text_as_html($mime, $upfx, $ctx) .
- '</pre><hr>'
+ _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
+ multipart_text_as_html($mime, $upfx, $ctx);
+ ${delete $ctx->{obuf}} .= '</pre><hr>';
}
# /$INBOX/$MESSAGE_ID/#R
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
- $ctx->{rv} = \$rv;
+ $ctx->{obuf} = \$rv;
msg_iter($mime, \&add_text_body, $ctx, 1);
- delete $ctx->{rv};
+ delete $ctx->{obuf};
# add the footer
$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
sub multipart_text_as_html {
my (undef, $mhref, $ctx) = @_; # $mime = $_[0]
$ctx->{mhref} = $mhref;
- $ctx->{rv} = \(my $rv = '');
# scan through all parts, looking for displayable text
msg_iter($_[0], \&add_text_body, $ctx, 1);
- ${delete $ctx->{rv}};
}
sub flush_quote {
my ($s, $l, $quot) = @_;
- # show everything in the full version with anchor from
- # short version (see above)
- my $rv = $l->linkify_1($$quot);
+ my $rv = $l->to_html($$quot);
# we use a <span> here to allow users to specify their own
# color for quoted text
- $rv = $l->linkify_2(ascii_html($rv));
$$quot = undef;
$$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
} else {
$sfn = 'a.bin';
}
- my $rv = $ctx->{rv};
+ my $rv = $ctx->{obuf};
$$rv .= qq($nl<a\nhref="$ctx->{mhref}$idx-$sfn">);
if ($err) {
$$rv .= "[-- Warning: decoded text below may be mangled --]\n";
$idx[0] = $upfx . $idx[0] if $upfx ne '';
$ctx->{-apfx} = join('/', @idx);
$ctx->{-anchors} = {}; # attr => filename
- $ctx->{-diff} = $diff = [];
+ $diff = 1;
delete $ctx->{-long_path};
my $spfx;
if ($ibx->{-repo_objs}) {
# split off quoted and unquoted blocks:
my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
$s = '';
- my $rv = $ctx->{rv};
+ my $rv = $ctx->{obuf};
if (defined($fn) || $depth > 0 || $err) {
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
- my $l = PublicInbox::Linkify->new;
+ my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
foreach my $cur (@sections) {
if ($cur =~ /\A>/) {
flush_quote($rv, $l, \$cur);
} elsif ($diff) {
- @$diff = split(/^/m, $cur);
- $cur = undef;
- flush_diff($rv, $ctx, $l);
+ flush_diff($rv, $ctx, \$cur);
} else {
# regular lines, OK
- $l->linkify_1($cur);
- $$rv .= $l->linkify_2(ascii_html($cur));
+ $$rv .= $l->to_html($cur);
$cur = undef;
}
}
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
-sub _msg_html_prepare {
+sub _msg_page_prepare_obuf {
my ($hdr, $ctx, $nr) = @_;
- my $atom = '';
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
}
$rv .= _parent_headers($hdr, $over);
$rv .= "\n";
+ $ctx->{obuf} = \$rv;
}
sub SKEL_EXPAND () {