diff options
| -rwxr-xr-x | bin/send-reports | 5 | ||||
| -rwxr-xr-x | web/index.cgi | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/send-reports b/bin/send-reports index 9af93f54a..9b94b04d2 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.26 2007-03-21 21:53:51 matthew Exp $ +# $Id: send-reports,v 1.27 2007-03-21 21:59:35 matthew Exp $ use strict; require 5.8.0; @@ -49,10 +49,9 @@ my $unsent = dbh()->selectall_arrayref( foreach my $row (@$unsent) { # XXX Needs locks! - my @all_councils = split /,\|/, $row->{council}; + my @all_councils = split /,|\|/, $row->{council}; my ($councils, $missing) = $row->{council} =~ /^([\d,]+)(?:\|([\d,]+))?/; my @councils = split /,/, $councils; - my @missing = split /,/, $missing; my $areas_info = mySociety::MaPit::get_voting_areas_info(\@all_councils); my (@to, @dear, %recips); my $all_confirmed = 1; diff --git a/web/index.cgi b/web/index.cgi index e18602903..88df9f551 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.98 2007-03-21 21:53:51 matthew Exp $ +# $Id: index.cgi,v 1.99 2007-03-21 21:59:35 matthew Exp $ # TODO # Nothing is done about the update checkboxes - not stored anywhere on anything! @@ -164,7 +164,7 @@ sub submit_problem { } push(@errors, 'No council selected') unless ($input{council} && $input{council} =~ /^(?:-1|[\d,]+(?:\|[\d,]+)?)$/); - push(@errors, 'Please enter a title') unless $input{title} =~ /\S/; + push(@errors, 'Please enter a subject') unless $input{title} =~ /\S/; push(@errors, 'Please enter some details') unless $input{detail} =~ /\S/; push(@errors, 'Please enter your name') unless $input{name} =~ /\S/; if ($input{email} !~ /\S/) { |