Quote decrypted message

[app-edwardng.git] / lib / App / EdwardNG.pm

diff --git a/lib/App/EdwardNG.pm b/lib/App/EdwardNG.pm
index 6f6b3a0adc0abc8cd3b4fcebb93050bc963a0817..a9cac089365c515bf4f89e67d2b7a7c3d17b1d8d 100644 (file)
--- a/lib/App/EdwardNG.pm
+++ b/lib/App/EdwardNG.pm
@@ -33,7 +33,7 @@ sub mg {
 sub first_part{
        my ($ent) = @_;
        return first_part $ent->parts(0) if $ent->parts;
-       $ent->bodyhandle->as_string
+       stringify [$ent->bodyhandle->as_lines]
 }
 
 sub process_message {
@@ -105,6 +105,7 @@ sub run {
        $parser->decode_bodies(0);
        $parser->output_to_core(1);
        my $in = $parser->parse(\*STDIN);
+       debug 'Received mail from ', $in->get('From');
 
        my ($tmpl, %params);
        try {
@@ -112,6 +113,7 @@ sub run {
        } catch {
                ($tmpl, %params) = (error => message => $_)
        };
+       debug "Result is $tmpl, GnuPG said:\n", $params{message};
 
        $params{plaintext} = first_part $params{decrypted} if $params{decrypted};
 
@@ -127,7 +129,7 @@ sub run {
        my $email_unencrypted = $email->dup;
        my $mg = mg always_trust => 1;
        my $encrypt_failed = $mg->mime_signencrypt($email, $in->get('From') =~ /<(.*)>/);
-       debug 'Could not encrypt message, sending unencrypted. GnuPG said ', stringify $mg->{last_message} if $encrypt_failed;
+       debug 'Could not encrypt message, sending unencrypted. GnuPG said:', "\n", stringify $mg->{last_message} if $encrypt_failed;
        sendmail $encrypt_failed ? $email_unencrypted : $email
 }