X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=098c9d36d22ea766ce6f828dc6f0633f15fa00a6;hp=b9a651cb5261e6b0981c015772387121d8907300;hb=237f1387a5410de5b85f2d9ee564c193ea896bf9;hpb=e9e1e766fa27b190f194941c497f022ad7bf1b1f diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm index b9a651c..098c9d3 100644 --- a/perl/Sesse/pr0n/Common.pm +++ b/perl/Sesse/pr0n/Common.pm @@ -131,11 +131,7 @@ sub get_query_string { next unless defined($value); next if (defined($defparam->{$key}) && $value == $defparam->{$key}); - $value = URI::Escape::uri_escape($value); - - # Unescape a few for prettiness (we'll need something for a real _, though) - $value =~ s/%20/_/g; - $value =~ s/%2F/\//g; + $value = pretty_escape($value); $str .= ($first) ? "?" : ';'; $str .= "$key=$value"; @@ -143,6 +139,27 @@ sub get_query_string { } return $str; } + +sub pretty_escape { + my $value = shift; + + $value = URI::Escape::uri_escape($value); + + # Unescape a few for prettiness (we'll need something for a real _, though) + $value =~ s/%20/_/g; + $value =~ s/%2F/\//g; + + return $value; +} + +sub pretty_unescape { + my $value = shift; + + # URI unescaping is already done for us + $value =~ s/_/ /g; + + return $value; +} sub print_link { my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;