diff options
| -rw-r--r-- | conf/httpd.conf | 3 | ||||
| -rwxr-xr-x | web/index.cgi | 4 | ||||
| -rwxr-xr-x | web/rss.cgi | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index 3b2926519..34be0de79 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -20,7 +20,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.28 2008-01-15 10:19:24 matthew Exp $ +# $Id: httpd.conf,v 1.29 2008-01-25 17:02:25 matthew Exp $ DirectoryIndex index.cgi @@ -62,6 +62,7 @@ RewriteRule ^/rss/area/([0-9]+)$ /rss.cgi?type=area_problems; RewriteRule ^/rss/(reports|area)/([^/]+)$ /reports.cgi?rss=$1;council=$2 [QSA] RewriteRule ^/report/([0-9]+)$ /index.cgi?id=$1 [QSA] +RewriteRule ^/alerts/?$ /alert [R=permanent] ProxyPass /tilma/ http://tilma.mysociety.org/ ProxyPassReverse /tilma/ http://tilma.mysociety.org/ diff --git a/web/index.cgi b/web/index.cgi index 9674bd519..77374d1c4 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: index.cgi,v 1.171 2008-01-15 09:55:07 matthew Exp $ +# $Id: index.cgi,v 1.172 2008-01-25 17:02:29 matthew Exp $ use strict; use Standard; @@ -377,6 +377,8 @@ sub display_form { # Map was clicked on $pin_x = Page::click_to_tile($pin_tile_x, $pin_x); $pin_y = Page::click_to_tile($pin_tile_y, $pin_y, 1); + $input{x} ||= $pin_x-1; + $input{y} ||= $pin_y-1; $px = Page::tile_to_px($pin_x, $input{x}); $py = Page::tile_to_px($pin_y, $input{y}); $easting = Page::tile_to_os($pin_x); diff --git a/web/rss.cgi b/web/rss.cgi index bd75f0ce0..d15da1763 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: rss.cgi,v 1.18 2007-08-29 23:03:16 matthew Exp $ +# $Id: rss.cgi,v 1.19 2008-01-25 17:02:29 matthew Exp $ use strict; use Standard; @@ -40,7 +40,8 @@ sub main { } elsif ($type eq 'all_problems') { mySociety::Alert::generate_rss($type, ''); } else { - throw Error::Simple('Unknown alert type') unless $type; + print $q->redirect('http://www.fixmystreet.com/alert'); + exit; } } Page::do_fastcgi(\&main); |