View | Details | Raw Unified | Return to bug 3810
Collapse All | Expand All

(-)a/C4/Letters.pm (-13 / +9 lines)
Lines 283-289 sub SendAlerts { Link Here
283
                    Message => "" . $innerletter->{content},
283
                    Message => "" . $innerletter->{content},
284
                    'Content-Type' => 'text/plain; charset="utf8"',
284
                    'Content-Type' => 'text/plain; charset="utf8"',
285
                    );
285
                    );
286
                sendmail(%mail);
286
                sendmail(%mail) or carp $Mail::Sendmail::error;
287
287
288
# warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
288
# warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
289
            }
289
            }
Lines 344-350 sub SendAlerts { Link Here
344
                Message        => "" . $innerletter->{content},
344
                Message        => "" . $innerletter->{content},
345
                'Content-Type' => 'text/plain; charset="utf8"',
345
                'Content-Type' => 'text/plain; charset="utf8"',
346
            );
346
            );
347
            sendmail(%mail);
347
            sendmail(%mail) or carp $Mail::Sendmail::error;
348
            warn
348
            warn
349
"sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
349
"sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
350
        }
350
        }
Lines 422-428 sub SendAlerts { Link Here
422
                Message => $mail_msg,
422
                Message => $mail_msg,
423
                'Content-Type' => 'text/plain; charset="utf8"',
423
                'Content-Type' => 'text/plain; charset="utf8"',
424
            );
424
            );
425
            sendmail(%mail);
425
            sendmail(%mail) or carp $Mail::Sendmail::error;
426
            logaction(
426
            logaction(
427
                "ACQUISITION",
427
                "ACQUISITION",
428
                "CLAIM ISSUE",
428
                "CLAIM ISSUE",
Lines 453-459 sub SendAlerts { Link Here
453
                Message => $letter->{'content'},
453
                Message => $letter->{'content'},
454
                'Content-Type' => 'text/plain; charset="utf8"',
454
                'Content-Type' => 'text/plain; charset="utf8"',
455
        );
455
        );
456
        sendmail(%mail);
456
        sendmail(%mail) or carp $Mail::Sendmail::error;
457
    }
457
    }
458
}
458
}
459
459
Lines 804-821 sub _send_message_by_email ($) { Link Here
804
       $sendmail_params{ Bcc } = $bcc;
804
       $sendmail_params{ Bcc } = $bcc;
805
    }
805
    }
806
    
806
    
807
    my $success = sendmail( %sendmail_params );
808
807
809
    if ( $success ) {
808
    if ( sendmail( %sendmail_params ) ) {
810
        # warn "Sendmail OK. Log says: " .  $Mail::Sendmail::log;
811
        _set_message_status( { message_id => $message->{'message_id'},
809
        _set_message_status( { message_id => $message->{'message_id'},
812
                               status     => 'sent' } );
810
                status     => 'sent' } );
813
        return $success;
811
        return 1;
814
    } else {
812
    } else {
815
        # warn "Mail::Sendmail::error - " . $Mail::Sendmail::error;
816
        # warn "Mail::Sendmail::log   - " . $Mail::Sendmail::log;
817
        _set_message_status( { message_id => $message->{'message_id'},
813
        _set_message_status( { message_id => $message->{'message_id'},
818
                               status     => 'failed' } );
814
                status     => 'failed' } );
815
        carp $Mail::Sendmail::error;
819
        return;
816
        return;
820
    }
817
    }
821
}
818
}
822
- 

Return to bug 3810