X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=add3dfc2738f17cb3357b511d467cb51fb6507ad;hb=4dfef4f8f26bc8615c695969bd99157c9f3d2f2a;hp=94058ed09ecd8039c678e271ace689a3b131f44d;hpb=fad9acd35e56a289ade90a62d056b2a6663d448c;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 94058ed0..add3dfc2 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -591,29 +591,42 @@ sub _msg_html_prepare {
$ctx->{-upfx} = '../';
}
my @title;
- foreach my $h (qw(From To Cc Subject Date)) {
- my $v = $hdr->header($h);
- defined($v) && ($v ne '') or next;
+ my $v;
+ if (defined($v = $hdr->header('From'))) {
$v = PublicInbox::Hval->new($v);
-
- if ($h eq 'From') {
- my @n = PublicInbox::Address::names($v->raw);
- $title[1] = ascii_html(join(', ', @n));
- obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx;
- } elsif ($h eq 'Subject') {
- $title[0] = $v->as_html;
- if ($srch) {
- $rv .= qq($h: );
- $rv .= $v->as_html . "\n";
- next;
- }
- }
+ my @n = PublicInbox::Address::names($v->raw);
+ $title[1] = ascii_html(join(', ', @n));
$v = $v->as_html;
+ if ($obfs_ibx) {
+ obfuscate_addrs($obfs_ibx, $v);
+ obfuscate_addrs($obfs_ibx, $title[1]);
+ }
+ $rv .= "From: $v\n" if $v ne '';
+ }
+ foreach my $h (qw(To Cc)) {
+ defined($v = $hdr->header($h)) or next;
+ $v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "$h: $v\n";
-
+ $rv .= "$h: $v\n" if $v ne '';
+ }
+ if (defined($v = $hdr->header('Subject')) && ($v ne '')) {
+ $v = ascii_html($v);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ if ($srch) {
+ $rv .= qq(Subject: $v\n);
+ } else {
+ $rv .= "Subject: $v\n";
+ }
+ $title[0] = $v;
+ } else { # dummy anchor for thread skeleton at bottom of page
+ $rv .= qq() if $srch;
+ $title[0] = '(no subject)';
+ }
+ if (defined($v = $hdr->header('Date'))) {
+ $v = ascii_html($v);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
+ $rv .= "Date: $v\n";
}
- $title[0] ||= '(no subject)';
$ctx->{-title_html} = join(' - ', @title);
foreach (@$mids) {
my $mid = PublicInbox::Hval->new_msgid($_) ;
@@ -1049,10 +1062,9 @@ sub index_nav { # callback for WwwStream
pagination_footer($ctx, '.')
}
-sub paginate_recent ($) {
- my ($ctx) = @_;
+sub paginate_recent ($$) {
+ my ($ctx, $lim) = @_;
my $t = $ctx->{qp}->{t} || '';
- my $lim = 200; # this is our window
my $opts = { limit => $lim };
my ($after, $before);
@@ -1094,7 +1106,7 @@ sub paginate_recent ($) {
sub index_topics {
my ($ctx) = @_;
- my $msgs = paginate_recent($ctx);
+ my $msgs = paginate_recent($ctx, 200); # 200 is our window
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic);
}