RSS sign-up page for all sorts of local feeds or email alerts, hopefully

clearly explained. Tidy up codebase a bit.

1 files changed, 3 insertions, 24 deletions

diff --git a/web/flickr2.cgi b/web/flickr2.cgi
index 1817ba9b0..631e96f8c 100755
--- a/web/flickr2.cgi
+++ b/web/flickr2.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w -I../perllib
 
 # flickr2.cgi:
 # Check photo details, and confirm for council
@@ -6,35 +6,15 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: flickr2.cgi,v 1.2 2007-08-24 22:35:51 matthew Exp $
+# $Id: flickr2.cgi,v 1.3 2007-08-29 23:03:16 matthew Exp $
 
 use strict;
-require 5.8.0;
-
-# Horrible boilerplate to set up appropriate library paths.
-use FindBin;
-use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use Standard;
 use URI::Escape;
-
 use mySociety::AuthToken;
-use mySociety::DBHandle qw(dbh select_all);
 use mySociety::Email;
 use mySociety::EmailUtil;
 
-use Page;
-
-BEGIN {
-    mySociety::Config::set_file("$FindBin::Bin/../conf/general");
-    mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
-    );
-}
-
 sub main {
     my $q = shift;
     my $out = '';
@@ -66,6 +46,5 @@ EOF
     print Page::header($q, title=>'Flickr photo upload');
     print $out;
     print Page::footer();
-    dbh()->rollback();
 }
 Page::do_fastcgi(\&main);