diff options
Diffstat (limited to 'web/confirm.cgi')
| -rwxr-xr-x | web/confirm.cgi | 105 |
1 files changed, 57 insertions, 48 deletions
diff --git a/web/confirm.cgi b/web/confirm.cgi index 9c18726c7..cdc59236a 100755 --- a/web/confirm.cgi +++ b/web/confirm.cgi @@ -1,12 +1,12 @@ #!/usr/bin/perl -w # confirm.cgi: -# Confirmation code for Neighbourhood Fix-It +# Confirmation code for FixMyStreet # # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: confirm.cgi,v 1.19 2007-06-01 14:24:41 matthew Exp $ +# $Id: confirm.cgi,v 1.20 2007-06-15 14:57:52 matthew Exp $ use strict; require 5.8.0; @@ -43,53 +43,14 @@ sub main { my $id = mySociety::AuthToken::retrieve($type, $token); if ($id) { if ($type eq 'update') { - dbh()->do("update comment set state='confirmed' where id=? and state='unconfirmed'", {}, $id); - my ($email) = dbh()->selectrow_array("select email from comment where id=?", {}, $id); - my ($problem_id, $fixed) = dbh()->selectrow_array("select problem_id,mark_fixed from comment where id=?", {}, $id); - if ($fixed) { - dbh()->do("update problem set state='fixed', lastupdate = ms_current_timestamp() - where id=? and state='confirmed'", {}, $problem_id); - } else { - # Only want to refresh problem if not already fixed - dbh()->do("update problem set lastupdate = ms_current_timestamp() - where id=? and state='confirmed'", {}, $problem_id); - } - my $salt = unpack('h*', random_bytes(8)); - my $secret = scalar(dbh()->selectrow_array('select secret from secret')); - my $signed_email = sha1_hex("$problem_id-$email-$salt-$secret"); - $out = '<form action="/alert" method="post">'; - $out .= $q->p(sprintf(_('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'), "/?id=$problem_id#update_$id")); - my $signup = <<EOF; -<input type="hidden" name="signed_email" value="$salt,$signed_email"> -<input type="hidden" name="email" value="$email"> -<input type="hidden" name="id" value="$problem_id"> -<input type="hidden" name="type" value="updates"> -EOF - $signup .= '<input type="submit" value="' . _('sign up') . '">'; - $out .= $q->p(sprintf(_('You could also <a href="%s">subscribe to the RSS feed</a> of updates by other local people on this problem, or %s if you wish to receive updates by email.'), "/rss/$problem_id", $signup)); - $out .= '</form>'; + my $problem_id; + ($out, $problem_id) = confirm_update($q, $id); + my $email = dbh()->selectrow_array("select email from comment where id=?", {}, $id); + $out .= advertise_updates($q, $problem_id, $email); } elsif ($type eq 'problem') { - dbh()->do("update problem set state='confirmed', confirmed=ms_current_timestamp(), lastupdate=ms_current_timestamp() - where id=? and state='unconfirmed'", {}, $id); - my ($email, $council) = dbh()->selectrow_array("select email, council from problem where id=?", {}, $id); - 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 = '<form action="/alert" method="post">'; - $out .= $q->p( - _('You have successfully confirmed your problem') - . ($council ? _(' and <strong>we will now send it to the council</strong>') : '') - . sprintf(_('. You can <a href="%s">view the problem on this site</a>.'), "/?id=$id") - ); - my $signup = <<EOF; -<input type="hidden" name="signed_email" value="$salt,$signed_email"> -<input type="hidden" name="email" value="$email"> -<input type="hidden" name="id" value="$id"> -<input type="hidden" name="type" value="updates"> -EOF - $signup .= '<input type="submit" value="' . _('sign up') . '">'; - $out .= $q->p(sprintf(_('You could also <a href="%s">subscribe to the RSS feed</a> of updates by other local people on this problem, or %s if you wish to receive updates by email.'), "/rss/$id", $signup)); - $out .= '</form>'; + $out = confirm_problem($q, $id); + my $email = dbh()->selectrow_array("select email from problem where id=?", {}, $id); + $out .= advertise_updates($q, $id, $email); } dbh()->commit(); } else { @@ -107,3 +68,51 @@ EOF } Page::do_fastcgi(\&main); +sub confirm_update { + my ($q, $id) = @_; + dbh()->do("update comment set state='confirmed' where id=? and state='unconfirmed'", {}, $id); + my ($problem_id, $fixed) = dbh()->selectrow_array("select problem_id,mark_fixed from comment where id=?", {}, $id); + if ($fixed) { + dbh()->do("update problem set state='fixed', lastupdate = ms_current_timestamp() + where id=? and state='confirmed'", {}, $problem_id); + } else { + # Only want to refresh problem if not already fixed + dbh()->do("update problem set lastupdate = ms_current_timestamp() + where id=? and state='confirmed'", {}, $problem_id); + } + my $out = '<form action="/alert" method="post">'; + $out .= $q->p(sprintf(_('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'), "/?id=$problem_id#update_$id")); + return ($problem_id, $out); +} + +sub confirm_problem { + my ($q, $id) = @_; + dbh()->do("update problem set state='confirmed', confirmed=ms_current_timestamp(), lastupdate=ms_current_timestamp() + where id=? and state='unconfirmed'", {}, $id); + my $council = dbh()->selectrow_array("select council from problem where id=?", {}, $id); + my $out = '<form action="/alert" method="post">'; + $out .= $q->p( + _('You have successfully confirmed your problem') + . ($council ? _(' and <strong>we will now send it to the council</strong>') : '') + . sprintf(_('. You can <a href="%s">view the problem on this site</a>.'), "/?id=$id") + ); + return $out; +} + +sub advertise_updates { + my ($q, $problem_id, $email) = @_; + my $salt = unpack('h*', random_bytes(8)); + my $secret = scalar(dbh()->selectrow_array('select secret from secret')); + my $signed_email = sha1_hex("$problem_id-$email-$salt-$secret"); + my $signup = <<EOF; +<input type="hidden" name="signed_email" value="$salt,$signed_email"> +<input type="hidden" name="email" value="$email"> +<input type="hidden" name="id" value="$problem_id"> +<input type="hidden" name="type" value="updates"> +EOF + $signup .= '<input type="submit" value="' . _('sign up') . '">'; + my $out = $q->p(sprintf(_('You could also <a href="%s">subscribe to the RSS feed</a> of updates by other local people on this problem, or %s if you wish to receive updates by email.'), "/rss/$problem_id", $signup)); + $out .= '</form>'; + return $out; +} + |