X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHval.pm;h=00b3c8b45946abff63461132bac7075307253b5b;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=79005d2109499aae4b4abe6cf216a7583c909ad1;hpb=af8434f5f729a541cf8c50dfcb7d96a413facd2b;p=public-inbox.git diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 79005d21..00b3c8b4 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2020 all contributors +# Copyright (C) 2014-2021 all contributors # License: AGPL-3.0+ # # represents a header value in various forms. Used for HTML generation @@ -10,7 +10,8 @@ use Encode qw(find_encoding); use PublicInbox::MID qw/mid_clean mid_escape/; use base qw/Exporter/; our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename src_escape - to_attr prurl mid_href/; + to_attr prurl mid_href fmt_ts ts2str/; +use POSIX qw(strftime); my $enc_ascii = find_encoding('us-ascii'); # safe-ish acceptable filename pattern for portability @@ -33,7 +34,7 @@ my %escape_sequence = ( "\x7f" => '\\x7f', # DEL ); -my %xhtml_map = ( +our %xhtml_map = ( '"' => '"', '&' => '&', "'" => ''', @@ -78,28 +79,35 @@ sub prurl ($$) { # However, • was chosen to make copy+paste errors more obvious sub obfuscate_addrs ($$;$) { my $ibx = $_[0]; - my $repl = $_[2] || '•'; + my $repl = $_[2] // '•'; my $re = $ibx->{-no_obfuscate_re}; # regex of domains - my $addrs = $ibx->{-no_obfuscate}; # { adddress => 1 } - $_[1] =~ s/(([\w\.\+=\-]+)\@([\w\-]+\.[\w\.\-]+))/ - my ($addr, $user, $domain) = ($1, $2, $3); - if ($addrs->{$addr} || ((defined $re && $domain =~ $re))) { - $addr; + my $addrs = $ibx->{-no_obfuscate}; # { $address => 1 } + $_[1] =~ s#(\S+)\@([\w\-]+\.[\w\.\-]+)# + my ($pfx, $domain) = ($1, $2); + if (index($pfx, '://') > 0 || $pfx !~ s/([\w\.\+=\-]+)\z//) { + "$pfx\@$domain"; } else { - $domain =~ s!([^\.]+)\.!$1$repl!; - $user . '@' . $domain + my $user = $1; + my $addr = "$user\@$domain"; + if ($addrs->{$addr} || ((defined($re) && + $domain =~ $re))) { + $pfx.$addr; + } else { + $domain =~ s!([^\.]+)\.!$1$repl!; + $pfx . $user . '@' . $domain + } } - /sge; + #sge; } # like format_sanitized_subject in git.git pretty.c with '%f' format string sub to_filename ($) { - my ($s, undef) = split(/\n/, $_[0]); + my $s = (split(/\n/, $_[0]))[0] // return; # empty string => undef $s =~ s/[^A-Za-z0-9_\.]+/-/g; $s =~ tr/././s; $s =~ s/[\.\-]+\z//; $s =~ s/\A[\.\-]+//; - $s + $s eq '' ? undef : $s; } # convert a filename (or any string) to HTML attribute @@ -123,4 +131,10 @@ sub to_attr ($) { $first . $str; } +# for the t= query parameter passed to overview DB +sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) }; + +# human-friendly format +sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } + 1;