Changeset 71

Timestamp:

Oct 17, 2006, 5:28:46 PM (14 years ago)

Author:

Dominic Hargreaves

Message:

Fix return link stuff (closes #16)

Location:

trunk/npemap.org.uk/cgi

Files:

• bad-postcode.fcgi (modified) (2 diffs)
• submit.fcgi (modified) (2 diffs)

trunk/npemap.org.uk/cgi/bad-postcode.fcgi

@@ -23 +23 @@
 setup_dbh();
 
-my $returnBaseURL = 'http://www.npemap.org.uk';
+my $returnBaseURL = '';
 
 my $cgi;
@@ -31 +31 @@
     # If we're given return URL parameters, basic sanity check to stop
     # funny business
-    
-    my $returnlink = '<a href="/tiles/map.html?' .int($cgi->param('easting')/1000). ",".int($cgi->param('northing')/1000)  . ',1">Go back</a>';   
-
-    if (defined $cgi->param('returnX') and ($cgi->param('returnX') =~ /\d+/) and
-        defined $cgi->param('returnY') and ($cgi->param('returnY') =~ /\d+/) ) {
-        $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html?' . $cgi->param('returnX') . ',' . $cgi->param('returnY') . ',1">Go back to the map</a>';
-    }
-
+    my $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html">Go back to the map</a>';
 
     # In case the database went away, make sure we have a connection

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

@@ -26 +26 @@
 
 my @fields = qw(easting northing postcode);
-my $returnBaseURL = 'http://www.npemap.org.uk';
+my $returnBaseURL = '';
 
 my $cgi;
@@ -35 +35 @@
     # funny business
     
-    my $returnlink = '<a href="/tiles/map.html?' .int($cgi->param('easting')/1000). ",".int($cgi->param('northing')/1000)  . ',1">Go back</a>';   
+    my $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html">Go back to the map</a>';   
 
-    if (defined $cgi->param('returnX') and ($cgi->param('returnX') =~ /\d+/) and
-        defined $cgi->param('returnY') and ($cgi->param('returnY') =~ /\d+/) ) {
-        $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html?' . $cgi->param('returnX') . ',' . $cgi->param('returnY') . ',1">Go back to the map</a>';
+    if (defined $cgi->param('easting') and ($cgi->param('easting') =~ /\d+/) and
+        defined $cgi->param('northing') and ($cgi->param('northing') =~ /\d+/) ) {
+        $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html?' . int($cgi->param('easting')/1000). ",".int($cgi->param('northing')/1000)  . ',1">Go back to the map</a>';
     }