Get rid of the confusingly named {rv} and {tip} fields
and unify them into {obuf} for readability.
{obuf} usage may be expanded to more areas in the future. This
will eventually make it easier for us to experiment with
alternative buffering schemes.
if ($nr == 1) {
# $more cannot be true w/o $smsg being defined:
my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : '';
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;
} elsif ($more) {
++$ctx->{end_nr};
# fake an EOF if {more} retrieval fails fails;
my $ibx = $ctx->{-inbox};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
my $hdr = $ctx->{hdr} = $mime->header_obj;
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);
+ _msg_html_prepare_obuf($hdr, $ctx, 0);
$ctx->{end_nr} = 2;
$ctx->{smsg} = $smsg;
$ctx->{mime} = $mime;
$ctx->{end_nr} = 2;
$ctx->{smsg} = $smsg;
$ctx->{mime} = $mime;
return '' unless $smsg;
my $upfx = '../' . mid_escape($smsg->mid) . '/';
my $mime = delete $smsg->{mime};
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_html_prepare_obuf($mime->header_obj, $ctx, $nr);
+ multipart_text_as_html($mime, $upfx, $ctx);
+ ${delete $ctx->{obuf}} .= '</pre><hr>';
}
# /$INBOX/$MESSAGE_ID/#R
}
# /$INBOX/$MESSAGE_ID/#R
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
msg_iter($mime, \&add_text_body, $ctx, 1);
msg_iter($mime, \&add_text_body, $ctx, 1);
# add the footer
$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
# 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;
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);
# scan through all parts, looking for displayable text
msg_iter($_[0], \&add_text_body, $ctx, 1);
} else {
$sfn = 'a.bin';
}
} else {
$sfn = 'a.bin';
}
$$rv .= qq($nl<a\nhref="$ctx->{mhref}$idx-$sfn">);
if ($err) {
$$rv .= "[-- Warning: decoded text below may be mangled --]\n";
$$rv .= qq($nl<a\nhref="$ctx->{mhref}$idx-$sfn">);
if ($err) {
$$rv .= "[-- Warning: decoded text below may be mangled --]\n";
# split off quoted and unquoted blocks:
my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
$s = '';
# split off quoted and unquoted blocks:
my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
$s = '';
if (defined($fn) || $depth > 0 || $err) {
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
if (defined($fn) || $depth > 0 || $err) {
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
+sub _msg_html_prepare_obuf {
my ($hdr, $ctx, $nr) = @_;
my ($hdr, $ctx, $nr) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
}
$rv .= _parent_headers($hdr, $over);
$rv .= "\n";
}
$rv .= _parent_headers($hdr, $over);
$rv .= "\n";
sub html_i { # WwwStream::getline callback
my ($nr, $ctx) = @_;
sub html_i { # WwwStream::getline callback
my ($nr, $ctx) = @_;
- $nr == 1 ? ${delete $ctx->{rv}} : undef;
+ $nr == 1 ? ${delete $ctx->{obuf}} : undef;
}
sub html_page ($$$) {
my ($ctx, $code, $strref) = @_;
my $wcb = delete $ctx->{-wcb};
$ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
}
sub html_page ($$$) {
my ($ctx, $code, $strref) = @_;
my $wcb = delete $ctx->{-wcb};
$ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
+ $ctx->{obuf} = $strref;
my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
$wcb ? $wcb->($res) : $res;
}
my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
$wcb ? $wcb->($res) : $res;
}
"<id>$uuid</id>$irt" .
qq{<content\ntype="xhtml">} .
qq{<div\nxmlns="http://www.w3.org/1999/xhtml">} .
"<id>$uuid</id>$irt" .
qq{<content\ntype="xhtml">} .
qq{<div\nxmlns="http://www.w3.org/1999/xhtml">} .
- qq(<pre\nstyle="white-space:pre-wrap">) .
- PublicInbox::View::multipart_text_as_html($mime, $href, $ctx) .
- '</pre></div></content></entry>';
+ qq(<pre\nstyle="white-space:pre-wrap">);
+ $ctx->{obuf} = \$s;
+ PublicInbox::View::multipart_text_as_html($mime, $href, $ctx);
+ delete $ctx->{obuf};
+ $s .= '</pre></div></content></entry>';