diff options
Diffstat (limited to 'web/flickr.cgi')
| -rwxr-xr-x | web/flickr.cgi | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/web/flickr.cgi b/web/flickr.cgi index 68e8fb396..ac0e83d78 100755 --- a/web/flickr.cgi +++ b/web/flickr.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl -w -I../perllib # flickr.cgi: # Register for Flickr usage, and update photos @@ -6,34 +6,15 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: flickr.cgi,v 1.4 2007-06-17 11:46:42 matthew Exp $ +# $Id: flickr.cgi,v 1.5 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 LWP::Simple; use mySociety::AuthToken; -use mySociety::DBHandle qw(dbh); 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; print Page::header($q, title=>'Flickr photo upload'); @@ -112,7 +93,6 @@ EOF print $out; print Page::footer(); - dbh()->rollback(); } Page::do_fastcgi(\&main); |