Changeset 139 for trunk/npemap.org.uk

Timestamp:

Oct 23, 2006, 3:34:48 PM (14 years ago)

Author:

Dominic Hargreaves

Message:

Should fix #17

File:

• trunk/npemap.org.uk/cgi/submit.fcgi (modified) (1 diff)

trunk/npemap.org.uk/cgi/submit.fcgi

@@ -82 +82 @@
 
     # Now validate the postcode input format
-    my $raw_postcode = $cgi->param('postcode1');
-    $raw_postcode .= ' ' . $cgi->param('postcode2') if defined $cgi->param('postcode2');
-    my $trimmed_postcode = $raw_postcode; 
-    $trimmed_postcode =~ s/^\s+//;
-    $trimmed_postcode =~ s/\s+$//;
-    my $postcode = Geo::Postcode->new($trimmed_postcode);
+    my ($trimmed_1, $trimmed_2) = ($cgi->param('postcode1'), $cgi->param('postcode2'));
+    $trimmed_1 =~ s/^\s+//;
+    $trimmed_2 =~ s/^\s+//;
+    $trimmed_1 =~ s/\s+$//;
+    $trimmed_2 =~ s/\s+$//;
+    my $raw_postcode = $trimmed_1;
+    $raw_postcode .= ' ' . $trimmed_2 if defined $trimmed_2;
+
+    unless (length(($trimmed_2)) == 1 or (length($trimmed_2) == 3) or (!defined $trimmed_2)) {
+        print_err("The postcode format is not valid", $returnlink);
+        next REQUEST;
+    }
+
+    my $postcode = Geo::Postcode->new($raw_postcode);
     my ($first, $second, $third, $fourth) = @{$postcode->fragments};
     my ($outward, $inward);