aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/send-reports8
-rwxr-xr-xweb/confirm.cgi10
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/send-reports b/bin/send-reports
index 9b94b04d2..bd72c3c5b 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.27 2007-03-21 21:59:35 matthew Exp $
+# $Id: send-reports,v 1.28 2007-03-21 22:41:48 matthew Exp $
use strict;
require 5.8.0;
@@ -98,9 +98,9 @@ foreach my $row (@$unsent) {
$h{missing} = '';
if ($missing) {
my $name = $areas_info->{$missing}->{name};
- $h{missing} = 'We realise this problem might be the responsibility of ' . $name
- . "; however, we don't have any contact details for them. If you know of an
- appropriate contact address, please get in touch.\n\n";
+ $h{missing} = 'We realise this problem might be the responsibility of ' . $name
+ . "; however, we don't currently have any contact details for them.
+If you know of an appropriate contact address, please do get in touch.\n\n";
}
$h{closest_address} = '';
diff --git a/web/confirm.cgi b/web/confirm.cgi
index 7c695d589..72f9609bc 100755
--- a/web/confirm.cgi
+++ b/web/confirm.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: confirm.cgi,v 1.11 2007-03-13 22:56:14 matthew Exp $
+# $Id: confirm.cgi,v 1.12 2007-03-21 22:41:48 matthew Exp $
use strict;
require 5.8.0;
@@ -70,15 +70,15 @@ or
EOF
} elsif ($type eq 'problem') {
dbh()->do("update problem set state='confirmed' where id=? and state='unconfirmed'", {}, $id);
- my $email = dbh()->selectrow_array("select email from problem where id=?", {}, $id);
+ my ($email, $council) = dbh()->selectrow_array("select email, council from problem where id=?", {}, $id);
+ $council = $council ? ' and <strong>we will now send it to the council</strong>' : '';
my $salt = unpack('h*', random_bytes(8));
my $secret = scalar(dbh()->selectrow_array('select secret from secret'));
my $signed_email = sha1_hex("$id-$email-$salt-$secret");
$out = <<EOF;
<form action="/alert" method="post">
-<p>You have successfully confirmed your problem and
-<strong>we will now send it to the council</strong>.
-you can <a href="/?id=$id">view the problem on this site</a>.</p>
+<p>You have successfully confirmed your problem$council.
+You can <a href="/?id=$id">view the problem on this site</a>.</p>
<p>You could also
<a href="/rss/$id">subscribe to the RSS feed</a> of updates by other local people on this problem,
or