-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# represents a header value in various forms. Used for HTML generation
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
"\x7f" => '\\x7f', # DEL
);
-my %xhtml_map = (
+our %xhtml_map = (
'"' => '"',
'&' => '&',
"'" => ''',
my $ibx = $_[0];
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
$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;