diff options
| -rwxr-xr-x | web/alert.cgi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index e41164334..a809dceb4 100755 --- a/web/alert.cgi +++ b/web/alert.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: alert.cgi,v 1.25 2008-05-13 16:00:14 matthew Exp $ +# $Id: alert.cgi,v 1.26 2008-05-13 16:13:20 matthew Exp $ use strict; use Standard; @@ -67,6 +67,10 @@ sub alert_list { return Page::geocode_choice($error, '/alert') if ref($error) eq 'ARRAY'; return alert_front_page($q, $error) if $error; + my $pretty_pc = $input_h{pc}; + $pretty_pc = mySociety::PostcodeUtil::canonicalise_postcode($input{pc}) + if mySociety::PostcodeUtil::is_valid_postcode($input{pc}); + my $errors = ''; $errors = '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors; @@ -158,7 +162,7 @@ but will only appear in the "Within the boundary" alert for the county council.' my $pics = Page::recent_photos(5, $e, $n, $dist); $pics = '<div id="alert_photos">' . $q->h2(_('Photos of recent nearby reports')) . $pics . '</div>' if $pics; - my $out = $q->h1(sprintf(_('Local RSS feeds and email alerts for ‘%s’'), $input_h{pc})); + my $out = $q->h1(sprintf(_('Local RSS feeds and email alerts for ‘%s’'), $pretty_pc)); $out .= <<EOF; <form id="alerts" method="post" action="/alert"> <input type="hidden" name="type" value="local"> @@ -169,7 +173,7 @@ $pics EOF $out .= $q->p(sprintf(_('Here are the types of local problem alerts for ‘%s’. Select which type of alert you’d like and click the button for an RSS -feed, or enter your email address to subscribe to an email alert.'), $input_h{pc})); +feed, or enter your email address to subscribe to an email alert.'), $pretty_pc)); $out .= $errors; $out .= $q->p(_('The simplest alert is our geographic one:')); my $label = sprintf(_('Problems within %skm of this location'), $dist); |