diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/handlemail | 23 | ||||
| -rwxr-xr-x | bin/handlemail-support | 20 | ||||
| -rwxr-xr-x | bin/send-alerts | 4 | ||||
| -rwxr-xr-x | bin/send-comments | 4 | ||||
| -rwxr-xr-x | bin/send-questionnaires | 4 | ||||
| -rwxr-xr-x | bin/send-reports | 4 | ||||
| -rwxr-xr-x | bin/update-schema | 13 |
7 files changed, 35 insertions, 37 deletions
diff --git a/bin/handlemail b/bin/handlemail index 5d4ac753c..597d08a5d 100755 --- a/bin/handlemail +++ b/bin/handlemail @@ -17,15 +17,14 @@ use strict; use warnings; require 5.8.0; -# Horrible boilerplate to set up appropriate library paths. -use FindBin; -use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../commonlib/perllib"; - -use mySociety::Config; BEGIN { - mySociety::Config::set_file("$FindBin::Bin/../conf/general"); + use File::Basename qw(dirname); + use File::Spec; + my $d = dirname(File::Spec->rel2abs($0)); + require "$d/../setenv.pl"; } + +use FixMyStreet; use mySociety::Email; use mySociety::EmailUtil; use mySociety::HandleMail; @@ -40,7 +39,7 @@ my %data = mySociety::HandleMail::get_message(); if ($data{is_bounce_message}) { #my $a = mySociety::HandleMail::get_bounce_recipient($data{message}); #my $token = mySociety::HandleMail::get_token($a, - # 'fms-', mySociety::Config::get('EMAILDOMAIN') + # 'fms-', FixMyStreet->config('EMAILDOMAIN') #); #exit(0) if $token eq 'DO-NOT-REPLY'; # A bounce we don't care about exit(0); # drop all other bounces currently @@ -48,13 +47,13 @@ if ($data{is_bounce_message}) { # Not a bounce, send an automatic response my $template = 'reply-autoresponse'; -open FP, "$FindBin::Bin/../templates/email/default/$template" or exit 75; -$template = join('', <FP>); -close FP; +my $fp = FixMyStreet->path_to("templates", "email", "default", $template)->open or exit 75; +$template = join('', <$fp>); +$fp->close; # We generate this as a bounce. my $mail = mySociety::Email::construct_email({ - From => [ mySociety::Config::get('CONTACT_EMAIL'), 'FixMyStreet' ], + From => [ FixMyStreet->config('CONTACT_EMAIL'), 'FixMyStreet' ], To => $data{return_path}, _template_ => $template, _parameters_ => { }, diff --git a/bin/handlemail-support b/bin/handlemail-support index 9808e447a..0ccde8ca7 100755 --- a/bin/handlemail-support +++ b/bin/handlemail-support @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # handlemail-support: # Handle an individual incoming mail message. @@ -11,17 +11,17 @@ # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ use strict; +use warnings; require 5.8.0; -# Horrible boilerplate to set up appropriate library paths. -use FindBin; -use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../commonlib/perllib"; - -use mySociety::Config; BEGIN { - mySociety::Config::set_file("$FindBin::Bin/../conf/general"); + use File::Basename qw(dirname); + use File::Spec; + my $d = dirname(File::Spec->rel2abs($0)); + require "$d/../setenv.pl"; } + +use FixMyStreet; use mySociety::EmailUtil; use mySociety::HandleMail; @@ -32,7 +32,7 @@ forward_on(); # --- sub forward_on { - my ($l, $d) = split /\@/, mySociety::Config::get('CONTACT_EMAIL'); + my ($l, $d) = split /\@/, FixMyStreet->config('CONTACT_EMAIL'); if (mySociety::EmailUtil::EMAIL_SUCCESS != mySociety::EmailUtil::send_email( join("\n", @{$data{lines}}) . "\n", @@ -50,7 +50,7 @@ sub is_ignorable { my ($from, $subject, $body) = ($head->get('From'), $head->get('Subject'), $m->body); $body = join("\n", @$body); - open my $fp, "$FindBin::Bin/../../data/ignored-emails.csv" or exit 75; + my $fp = FixMyStreet->path_to("..", "data", "ignored-emails.csv")->open or exit 75; while (<$fp>) { chomp; my ($f, $s, $b) = split /,/; diff --git a/bin/send-alerts b/bin/send-alerts index b0040268a..eaebe9b66 100755 --- a/bin/send-alerts +++ b/bin/send-alerts @@ -20,10 +20,10 @@ BEGIN { use CGI; # XXX use CronFns; -use mySociety::Config; +use FixMyStreet; use FixMyStreet::DB; -my $site = CronFns::site(mySociety::Config::get('BASE_URL')); +my $site = CronFns::site(FixMyStreet->config('BASE_URL')); CronFns::language($site); FixMyStreet::DB->resultset('AlertType')->email_alerts(); diff --git a/bin/send-comments b/bin/send-comments index c3f21fb2c..bf5f27ce0 100755 --- a/bin/send-comments +++ b/bin/send-comments @@ -22,8 +22,8 @@ BEGIN { use CronFns; -use mySociety::Config; use DateTime; +use FixMyStreet; use FixMyStreet::Cobrand; use FixMyStreet::DB; use Open311; @@ -36,7 +36,7 @@ use constant COUNCIL_ID_OXFORDSHIRE => 2237; # Set up site, language etc. my ($verbose, $nomail) = CronFns::options(); -my $base_url = mySociety::Config::get('BASE_URL'); +my $base_url = FixMyStreet->config('BASE_URL'); my $site = CronFns::site($base_url); my $bodies = FixMyStreet::DB->resultset('Body')->search( { diff --git a/bin/send-questionnaires b/bin/send-questionnaires index 141c21560..15b8027f3 100755 --- a/bin/send-questionnaires +++ b/bin/send-questionnaires @@ -19,12 +19,12 @@ BEGIN { use CGI; # XXX Awkward kludge use CronFns; +use FixMyStreet; use FixMyStreet::DB; -use mySociety::Config; my %params; ( $params{verbose}, $params{nomail} ) = CronFns::options(); -$params{site} = CronFns::site(mySociety::Config::get('BASE_URL')); +$params{site} = CronFns::site(FixMyStreet->config('BASE_URL')); CronFns::language($params{site}); FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires( \%params ); diff --git a/bin/send-reports b/bin/send-reports index 5765edbfa..2dfe415fa 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -20,10 +20,10 @@ BEGIN { use CGI; # XXX use CronFns; -use mySociety::Config; +use FixMyStreet; use FixMyStreet::DB; -my $site = CronFns::site(mySociety::Config::get('BASE_URL')); +my $site = CronFns::site(FixMyStreet->config('BASE_URL')); CronFns::language($site); FixMyStreet::DB->resultset('Problem')->send_reports(); diff --git a/bin/update-schema b/bin/update-schema index 1af08b002..c6b197deb 100755 --- a/bin/update-schema +++ b/bin/update-schema @@ -39,20 +39,19 @@ BEGIN { require "$bin_dir/../setenv.pl"; } -use mySociety::Config; +use FixMyStreet; use mySociety::DBHandle qw(dbh); use mySociety::MaPit; use Getopt::Long; use Pod::Usage; -mySociety::Config::set_file("$bin_dir/../conf/general"); my %args = ( - Name => mySociety::Config::get('FMS_DB_NAME'), - User => mySociety::Config::get('FMS_DB_USER'), - Password => mySociety::Config::get('FMS_DB_PASS'), + Name => FixMyStreet->config('FMS_DB_NAME'), + User => FixMyStreet->config('FMS_DB_USER'), + Password => FixMyStreet->config('FMS_DB_PASS'), ); -$args{Host} = mySociety::Config::get('FMS_DB_HOST', undef) if mySociety::Config::get('FMS_DB_HOST'); -$args{Port} = mySociety::Config::get('FMS_DB_PORT', undef) if mySociety::Config::get('FMS_DB_PORT'); +$args{Host} = FixMyStreet->config('FMS_DB_HOST', undef) if FixMyStreet->config('FMS_DB_HOST'); +$args{Port} = FixMyStreet->config('FMS_DB_PORT', undef) if FixMyStreet->config('FMS_DB_PORT'); mySociety::DBHandle::configure( %args ); my ($commit, $version, $downgrade, $help); |