diff options
| -rw-r--r-- | conf/httpd.conf | 4 | ||||
| -rwxr-xr-x | web/confirm.cgi | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index 9d4ad9c65..242d7f5f0 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -20,7 +20,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.6 2007-01-26 01:01:23 matthew Exp $ +# $Id: httpd.conf,v 1.7 2007-01-26 01:05:35 matthew Exp $ DirectoryIndex index.cgi @@ -33,7 +33,7 @@ RewriteRule ^/[Cc]/([0-9A-Za-z]{16}).*$ /confirm.cgi?type=update;token=$1 RewriteRule ^/[Pp]/([0-9A-Za-z]{16}).*$ /confirm.cgi?type=problem;token=$1 RewriteRule ^/rss/([0-9]+)$ /rss.cgi?type=new_updates;id=$1 [QSA] -RewriteRule ^/rss/([0-9]+)/([0-9]+)$ /rss.cgi?type=local_problems;x=$1;y=$2 [QSA] +RewriteRule ^/rss/([0-9]+),([0-9]+)$ /rss.cgi?type=local_problems;x=$1;y=$2 [QSA] RewriteRule ^/rss/problems$ /rss.cgi?type=new_problems [QSA] ProxyPass /tilma/ http://tilma.mysociety.org/ diff --git a/web/confirm.cgi b/web/confirm.cgi index 56b63cc5f..10f2b9656 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.5 2006-10-10 20:45:09 matthew Exp $ +# $Id: confirm.cgi,v 1.6 2007-01-26 01:05:35 matthew Exp $ use strict; require 5.8.0; @@ -48,12 +48,14 @@ sub main { } elsif ($reopen) { dbh()->do("update problem set state='confirmed' where id=? and state='fixed'", {}, $id); } + # XXX: Ask about email alert here, and RSS feed? Or should the form have another checkbox? $out = <<EOF; <p>You have successfully confirmed your update and you can now <a href="/?id=$id">view it on the site</a>.</p> EOF } elsif ($type eq 'problem') { dbh()->do("update problem set state='confirmed' where id=?", {}, $id); my $pc = dbh()->selectrow_array("select postcode from problem where id=?", {}, $id); + # Ask about email alert here, and RSS feed? $out = <<EOF; <p>You have successfully confirmed your problem and you can now <a href="/?id=$id;pc=$pc">view it on the site</a>.</p> EOF |