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 from_attr/;
+ to_attr prurl/;
my $enc_ascii = find_encoding('us-ascii');
# safe-ish acceptable filename pattern for portability
}
}
-sub prurl {
+# returns a protocol-relative URL string
+sub prurl ($$) {
my ($env, $u) = @_;
+ if (ref($u) eq 'ARRAY') {
+ my $h = $env->{HTTP_HOST} // $env->{SERVER_NAME};
+ my @host_match = grep(/\b\Q$h\E\b/, @$u);
+ $u = $host_match[0] // $u->[0];
+ # fall through to below:
+ }
index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
}
return if index($str, '//') >= 0;
my $first = '';
+ utf8::encode($str); # to octets
if ($str =~ s/\A([^A-Ya-z])//ms) { # start with a letter
$first = sprintf('Z%02x', ord($1));
}
$str =~ s/([^A-Za-z0-9_\.\-])/$ESCAPES{$1}/egms;
- $first . $str;
-}
-
-# reverse the result of to_attr
-sub from_attr ($) {
- my ($str) = @_;
- my $first = '';
- if ($str =~ s/\AZ([a-f0-9]{2})//ms) {
- $first = chr(hex($1));
- }
- $str =~ s!::([a-f0-9]{2})!chr(hex($1))!egms;
- $str =~ tr!:!/!;
+ utf8::decode($str); # allow wide chars
$first . $str;
}