Change emails to use construct_email from mySociety::Email for encoding and line wrapping

1 files changed, 21 insertions, 4 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 3e3c9c8a8..44f85aa9f 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -7,6 +7,7 @@ use FixMyStreet;
 use FixMyStreet::Cobrand;
 use Memcached;
 use Problems;
+use mySociety::Email;
 
 use Catalyst (
     'Static::Simple',    #
@@ -58,6 +59,16 @@ __PACKAGE__->config(
                 user_model => 'DB::User',
             },
         },
+        no_password => {       # use post confirm etc
+            credential => {    # Catalyst::Authentication::Credential::Password
+                class         => 'Password',
+                password_type => 'none',
+            },
+            store => {         # Catalyst::Authentication::Store::DBIx::Class
+                class      => 'DBIx::Class',
+                user_model => 'DB::User',
+            },
+        },
     },
 );
 
@@ -179,16 +190,22 @@ sub send_email {
     # render the template
     my $content = $c->view('Email')->render( $c, $template, $vars );
 
-    # create an email
+    # create an email - will parse headers out of content
     my $email = Email::Simple->new($content);
     $email->header_set( ucfirst($_), $vars->{$_} )
       for grep { $vars->{$_} } qw( to from subject);
 
-    # always send utf8 emails
-    $email->header_set( 'Content-Type' => 'text/plain; charset="utf-8"' );
+    # pass the email into mySociety::Email to construct the on the wire 7bit
+    # format - this should probably happen in the transport instead but hohum.
+    my $email_text = mySociety::Email::construct_email(
+        {
+            _unwrapped_body_ => $email->body,    # will get line wrapped
+            $email->header_pairs
+        }
+    );
 
     # send the email
-    $c->model('EmailSend')->send($email);
+    $c->model('EmailSend')->send($email_text);
 
     return $email;
 }