www: label sections and hopefully improve navigation

[public-inbox.git] / lib / PublicInbox / Hval.pm

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 9be163aa70c13b39eb19c326458886ef1a9f75c8..652aef3daee55ab926e31262e0b722b1efbe568e 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -1,40 +1,39 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 #
-# represents a header value in various forms
+# represents a header value in various forms.  Used for HTML generation
+# in our web interface(s)
 package PublicInbox::Hval;
 use strict;
 use warnings;
-use fields qw(raw href);
 use Encode qw(find_encoding);
 use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw/mid_clean/;
+use base qw/Exporter/;
+our @EXPORT_OK = qw/ascii_html/;
+
+# for user-generated content (UGC) which may have excessively long lines
+# and screw up rendering on some browsers.  This is the only CSS style
+# feature we use.
+use constant STYLE => '<style>pre{white-space:pre-wrap}</style>';
 
 my $enc_ascii = find_encoding('us-ascii');
 
 sub new {
        my ($class, $raw, $href) = @_;
-       my $self = fields::new($class);
 
-       # we never care about leading/trailing whitespace
-       $raw =~ s/\A\s*//;
+       # we never care about trailing whitespace
        $raw =~ s/\s*\z//;
-       $self->{raw} = $raw;
-       $self->{href} = defined $href ? $href : $raw;
-       $self;
+       bless {
+               raw => $raw,
+               href => defined $href ? $href : $raw,
+       }, $class;
 }
 
 sub new_msgid {
        my ($class, $msgid) = @_;
-       $msgid =~ s/\A\s*<?//;
-       $msgid =~ s/>?\s*\z//;
-
-       if (length($msgid) <= 40) {
-               $class->new($msgid);
-       } else {
-               require Digest::SHA;
-               my $hex = Digest::SHA::sha1_hex($msgid);
-               $class->new($msgid, $hex);
-       }
+       $msgid = mid_clean($msgid);
+       $class->new($msgid, $msgid);
 }
 
 sub new_oneline {
@@ -55,6 +54,7 @@ my %xhtml_map = (
 
 sub ascii_html {
        my ($s) = @_;
+       $s =~ s/\r\n/\n/sg; # fixup bad line endings
        $s =~ s/([<>&'"])/$xhtml_map{$1}/ge;
        $enc_ascii->encode($s, Encode::HTMLCREF);
 }
@@ -70,4 +70,9 @@ sub raw {
        }
 }
 
+sub prurl {
+       my ($env, $u) = @_;
+       index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
+}
+
 1;