UCW::CGI: Implemented UTF-8 mode (compatible with `use utf8')

diff --git a/ucw/perl/UCW/CGI.pm b/ucw/perl/UCW/CGI.pm
index f7e033d11d90aab758fb4f556f6779728fe025bf..73238a5be3413f2b246867c3608f42e57e6da316 100644 (file)
--- a/ucw/perl/UCW/CGI.pm
+++ b/ucw/perl/UCW/CGI.pm
@@ -60,17 +60,23 @@ our @ISA = qw(Exporter);
 our @EXPORT = qw(&html_escape &url_escape &url_deescape &url_param_escape &url_param_deescape &self_ref &self_form &http_get);
 our @EXPORT_OK = qw();
 
+our $utf8_mode = 0;
+
 ### Escaping ###
 
 sub url_escape($) {
        my $x = shift @_;
+       utf8::encode($x) if $utf8_mode;
        $x =~ s/([^-\$_.!*'(),0-9A-Za-z\x80-\xff])/"%".unpack('H2',$1)/ge;
+       utf8::decode($x) if $utf8_mode;
        return $x;
 }
 
 sub url_deescape($) {
        my $x = shift @_;
+       utf8::encode($x) if $utf8_mode;
        $x =~ s/%(..)/pack("H2",$1)/ge;
+       utf8::decode($x) if $utf8_mode;
        return $x;
 }
 
@@ -138,6 +144,7 @@ sub parse_raw_args_ll($$) {
        my ($arg, $s) = @_;
        $s =~ s/\r\n/\n/g;
        $s =~ s/\r/\n/g;
+       utf8::decode($s) if $utf8_mode;
        push @{$raw_args{$arg}}, $s;
 }