diff options
| -rwxr-xr-x | bin/send-reports | 4 | ||||
| -rw-r--r-- | perllib/Page.pm | 5 | ||||
| -rwxr-xr-x | web/index.cgi | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/bin/send-reports b/bin/send-reports index d3089a03c..96d3550d4 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: send-reports,v 1.38 2007-05-15 13:43:20 matthew Exp $ +# $Id: send-reports,v 1.39 2007-05-16 10:55:45 matthew Exp $ use strict; require 5.8.0; @@ -63,7 +63,7 @@ foreach my $row (@$unsent) { my ($council_email, $confirmed, $note) = dbh()->selectrow_array( "SELECT email,confirmed,note FROM contacts WHERE deleted='f' and area_id=? AND category=?", {}, $council, $row->{category}); - $council_email = essex_contact($row->{easting}, $row->{northing}) if $council == 2225; + $council_email = essex_contact($row->{easting}, $row->{northing}) if $council == 2225; unless ($confirmed) { $all_confirmed = 0; $note = 'Council ' . $row->{council} . ' deleted' diff --git a/perllib/Page.pm b/perllib/Page.pm index 2826c7921..f1b0eda6e 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: Page.pm,v 1.50 2007-05-15 15:12:22 matthew Exp $ +# $Id: Page.pm,v 1.51 2007-05-16 10:55:46 matthew Exp $ # package Page; @@ -376,8 +376,11 @@ sub display_problem_text { # Display information about problem $out .= '<p><em>Reported '; + $out .= 'in the ' . ent($problem->{category}) . ' category ' + if $problem->{category} && $problem->{category} ne 'Other'; $out .= ($problem->{anonymous}) ? 'anonymously' : "by " . ent($problem->{name}); $out .= ' at ' . prettify_epoch($problem->{time}); + $out .= '; the map was not used so pin location may be inaccurate' unless ($problem->{used_map}); if ($problem->{council}) { if ($problem->{whensent}) { $problem->{council} =~ s/\|.*//g; diff --git a/web/index.cgi b/web/index.cgi index 292c0699a..5819b707b 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.133 2007-05-15 13:43:21 matthew Exp $ +# $Id: index.cgi,v 1.134 2007-05-16 10:55:46 matthew Exp $ use strict; require 5.8.0; @@ -551,9 +551,10 @@ sub display_problem { # Get all information from database my $problem = dbh()->selectrow_hashref( - "select state, easting, northing, title, detail, name, extract(epoch from confirmed) as time, photo, anonymous, - extract(epoch from whensent-confirmed) as whensent, council, id, - extract(epoch from ms_current_timestamp()-lastupdate) as duration + "select id, easting, northing, council, category, title, detail, photo, + used_map, name, anonymous, extract(epoch from confirmed) as time, + state, extract(epoch from whensent-confirmed) as whensent, + extract(epoch from ms_current_timestamp()-lastupdate) as duration from problem where id=? and state in ('confirmed','fixed', 'hidden')", {}, $input{id}); return display_location($q, 'Unknown problem ID') unless $problem; return front_page($q, 'That problem has been hidden from public view as it contained inappropriate public details') if $problem->{state} eq 'hidden'; |