5 files changed, 6 insertions, 58 deletions

diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index 959ead245..be738bb8b 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -8,7 +8,6 @@ use JSON;
 use DateTime;
 use DateTime::Format::ISO8601;
 use List::MoreUtils 'uniq';
-use FixMyStreet::App;
 
 =head1 NAME
 
@@ -81,7 +80,7 @@ sub problems : Local {
         $date_col = 'lastupdate';
     }
 
-    my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+    my $dt_parser = $c->model('DB')->schema->storage->datetime_parser;
 
     my $one_day = DateTime::Duration->new( days => 1 );
     my $query = {
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index b817fe326..586d5e7ae 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -218,7 +218,7 @@ sub query_main : Private {
         . ($alert_type->head_table ? $alert_type->head_table . '_id=? and ' : '')
         . $alert_type->item_where . ' order by '
         . $alert_type->item_order;
-    my $rss_limit = mySociety::Config::get('RSS_LIMIT');
+    my $rss_limit = FixMyStreet->config('RSS_LIMIT');
     $query .= " limit $rss_limit" unless $c->stash->{type} =~ /^all/;
 
     my $q = $c->model('DB::Alert')->result_source->storage->dbh->prepare($query);
diff --git a/perllib/FixMyStreet/App/Model/DB.pm b/perllib/FixMyStreet/App/Model/DB.pm
index f9e43172f..ac1f98dc9 100644
--- a/perllib/FixMyStreet/App/Model/DB.pm
+++ b/perllib/FixMyStreet/App/Model/DB.pm
@@ -8,7 +8,7 @@ use FixMyStreet;
 
 __PACKAGE__->config(
     schema_class => 'FixMyStreet::DB',
-    connect_info => FixMyStreet->dbic_connect_info,
+    connect_info => sub { FixMyStreet::DB->storage->dbh },
 );
 
 =head1 NAME
diff --git a/perllib/FixMyStreet/App/Model/EmailSend.pm b/perllib/FixMyStreet/App/Model/EmailSend.pm
index 475026267..93751d4a6 100644
--- a/perllib/FixMyStreet/App/Model/EmailSend.pm
+++ b/perllib/FixMyStreet/App/Model/EmailSend.pm
@@ -4,67 +4,16 @@ use base 'Catalyst::Model::Factory';
 use strict;
 use warnings;
 
-use FixMyStreet;
-use Email::Send;
-
 =head1 NAME
 
 FixMyStreet::App::Model::EmailSend
 
 =head1 DESCRIPTION
 
-Thin wrapper around Email::Send - configuring it correctly acording to our config.
-
-If the config value 'SMTP_SMARTHOST' is set then email is routed via SMTP to
-that. Otherwise it is sent using a 'sendmail' like binary on the local system.
-
-And finally if if FixMyStreet->test_mode returns true then emails are not sent
-at all but are stored in memory for the test suite to inspect (using
-Email::Send::Test).
+Catalyst Model wrapper around FixMyStreet::EmailSend
 
 =cut
 
-my $args = undef;
-
-if ( FixMyStreet->test_mode ) {
-
-    # Email::Send::Test
-    $args = { mailer => 'Test', };
-}
-elsif ( my $smtp_host = FixMyStreet->config('SMTP_SMARTHOST') ) {
-
-    # Email::Send::SMTP
-    my $type = FixMyStreet->config('SMTP_TYPE') || '';
-    my $port = FixMyStreet->config('SMTP_PORT') || '';
-    my $username = FixMyStreet->config('SMTP_USERNAME') || '';
-    my $password = FixMyStreet->config('SMTP_PASSWORD') || '';
-
-    unless ($port) {
-        $port = 25;
-        $port = 465 if $type eq 'ssl';
-        $port = 587 if $type eq 'tls';
-    }
-
-    my $mailer_args = [
-        Host => $smtp_host,
-        Port => $port,
-    ];
-    push @$mailer_args, ssl => 1 if $type eq 'ssl';
-    push @$mailer_args, tls => 1 if $type eq 'tls';
-    push @$mailer_args, username => $username, password => $password
-        if $username && $password;
-    $args = {
-        mailer      => 'FixMyStreet::EmailSend::DoNotReply',
-        mailer_args => $mailer_args,
-    };
-}
-else {
-
-    # Email::Send::Sendmail
-    $args = { mailer => 'Sendmail' };
-}
-
 __PACKAGE__->config(
-    class => 'Email::Send',
-    args  => $args,
+    class => 'FixMyStreet::EmailSend',
 );
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index b18460821..f1334ff38 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -56,7 +56,7 @@ has upload_dir => (
     lazy => 1,
     default => sub {
         my $self = shift;
-        my $cache_dir = path( $self->c->config->{UPLOAD_DIR} );
+        my $cache_dir = path( FixMyStreet->config('UPLOAD_DIR') );
         $cache_dir->mkpath;
         unless ( -d $cache_dir && -w $cache_dir ) {
             warn "Can't find/write to photo cache directory '$cache_dir'";