X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=b066499c464a2a48250bd2340d85fbb00a0a0fea;hb=63cb5b41d9b06d0b7f522ef154dd9f57ea428bae;hp=3dd6831f3e2337501d36cd38791848d1ec929074;hpb=bbb2383f64acde4451b241c200600e4bb33a9030;p=kivitendo-erp.git diff --git a/SL/Mailer.pm b/SL/Mailer.pm index 3dd6831f3..b066499c4 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -151,8 +151,6 @@ sub _create_attachment_part { my $file_id = 0; my $email_journal = $::instance_conf->get_email_journal; - $::lxdebug->message(LXDebug->DEBUG2(), "mail5 att=" . $attachment . " email_journal=" . $email_journal . " id=" . $attachment->{id}); - if (ref($attachment) eq "HASH") { $attributes{filename} = $attachment->{name}; $file_id = $attachment->{id} || '0'; @@ -177,8 +175,6 @@ sub _create_attachment_part { $attachment_content ||= ' '; $attributes{charset} = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/}); - $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{content_type} . " filename=" . $attributes{filename}); - my $ent; if ( $attributes{content_type} eq 'message/rfc822' ) { $ent = Email::MIME->new($attachment_content); @@ -268,10 +264,6 @@ sub send { my $email = $self->_create_message; - #$::lxdebug->message(0, "message: " . $email->as_string); - # return "boom"; - - $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to}); my $from_obj = (Email::Address->parse($self->{from}))[0]; $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]); @@ -375,7 +367,7 @@ SL::Mailer - Base class for sending mails from kivitendo =head1 OVERVIEW -Mail can be send from kivitendo via the sendmail command or the smtp protocol. +Mail can be sent from kivitendo via the sendmail command or the smtp protocol. =head1 INTERNAL DATA TYPES @@ -385,7 +377,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol. =item C<%mail_delivery_modules> - Currently two modules are supported either smtp or sendmail. + Currently two modules are supported: smtp or sendmail. =item C<%type_to_table> @@ -417,7 +409,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol. =item C - If a mail was send successfully the internal functions _store_in_journal + If a mail was sent successfully the internal function _store_in_journal is called if email journaling is enabled. If _store_in_journal was executed successfully and the calling form is already persistent (database id) a record_link will be created. @@ -430,7 +422,7 @@ Mail can be send from kivitendo via the sendmail command or the smtp protocol. If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in - this order) exists a record link from record to email journal is created. + this order) exist a record link from record to email journal is created. Will fail silently if record_link creation wasn't successful (same behaviour as _store_in_journal).