Added functions for automatic processing of script arguments.

diff --git a/lib/perl/CGI.pm b/lib/perl/CGI.pm
index 255859e57ccd4b5c4a0a19ba40c8a33f6738c8be..286bca52f7a4fa0c5636de9be6891b3b68e8fcd2 100644 (file)
--- a/lib/perl/CGI.pm
+++ b/lib/perl/CGI.pm
@@ -16,14 +16,15 @@ BEGIN {
        our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
        $VERSION = 1.0;
        @ISA = qw(Exporter);
-       @EXPORT = qw(&html_escape &url_escape);
+       @EXPORT = qw(&html_escape &url_escape &self_ref &self_form);
        @EXPORT_OK = qw();
        %EXPORT_TAGS = ();
 }
 
 sub url_escape($) {
        my $x = shift @_;
-       $x =~ s/([^-\$_.+!*'(),0-9A-Za-z\x80-\xff])/"%".unpack('H2',$1)/ge;
+       $x =~ s/([^-\$_.+!*'(),0-9A-Za-z\x80-\xff ])/"%".unpack('H2',$1)/ge;
+       $x =~ s/ /+/g;
        return $x;
 }
 
@@ -36,4 +37,82 @@ sub html_escape($) {
        return $x;
 }
 
+our $arg_table;
+
+sub parse_arg_string($) {
+       my ($s) = @_;
+       $s =~ s/\s+//;
+       foreach $_ (split /&/,$s) {
+               (/^([^=]+)=(.*)$/) or next;
+               my $arg = $arg_table->{$1} or next;
+               $_ = $2;
+               s/\+/ /g;
+               s/%(..)/pack("c",hex $1)/eg;
+               s/(\r|\n|\t)/ /g;
+               s/^\s+//;
+               s/\s+$//;
+               if (my $rx = $arg->{'check'}) {
+                       if (!/^$rx$/) { $_ = $arg->{'default'}; }
+               }
+               ${$arg->{'var'}} = $_;
+       }
+}
+
+sub parse_args($) {
+       $arg_table = shift @_;
+       foreach my $a (values %$arg_table) {
+               defined($a->{'default'}) or $a->{'default'}="";
+               ${$a->{'var'}} = $a->{'default'};
+       }
+       defined $ENV{"GATEWAY_INTERFACE"} or die "Not called as a CGI script";
+       my $method = $ENV{"REQUEST_METHOD"};
+       if ($method eq "GET") {
+               parse_arg_string($ENV{"QUERY_STRING"});
+       } elsif ($method eq "POST") {
+               if ($ENV{"CONTENT_TYPE"} =~ /^application\/x-www-form-urlencoded\b/i) {
+                       while (<STDIN>) {
+                               chomp;
+                               parse_arg_string($_);
+                       }
+               } else {
+                       return "Unknown content type for POST data";
+               }
+       } else {
+               return "Unknown request method";
+       }
+}
+
+sub make_out_args($) {
+       my ($overrides) = @_;
+       my $out = {};
+       foreach my $name (keys %$arg_table) {
+               my $arg = $arg_table->{$name};
+               defined $arg->{'pass'} && !$arg->{'pass'} && !exists $overrides->{$name} && next;
+               my $value;
+               if (!defined($value = $overrides->{$name})) {
+                       if (exists $overrides->{$name}) {
+                               $value = $arg->{'default'};
+                       } else {
+                               $value = ${$arg->{'var'}};
+                       }
+               }
+               if ($value ne $arg->{'default'}) {
+                       $out->{$name} = $value;
+               }
+       }
+       return $out;
+}
+
+sub self_ref(@) {
+       my %h = @_;
+       my $out = make_out_args(\%h);
+       return "?" . join('&', map { "$_=" . url_escape($out->{$_}) } sort keys %$out);
+}
+
+sub self_form(@) {
+       my %h = @_;
+       my $out = make_out_args(\%h);
+       return join('', map { "<input type=hidden name=$_ value='" . html_escape($out->{$_}) . "'>\n" } sort keys %$out);
+}
+
 1;  # OK