use SL::DB::EmailJournalAttachment;
use SL::DB::Employee;
use SL::Template;
+use SL::Version;
use strict;
$domain =~ s/.*\@//;
$domain =~ s/>.*//;
- return "kivitendo-$self->{version}-" . time() . "-${$}-${num_sent}\@$domain";
+ return "kivitendo-" . SL::Version->get_version . "-" . time() . "-${$}-${num_sent}\@$domain";
}
sub _create_address_headers {
$self->_store_in_journal('failed', 'driver could not be created; check your configuration & log files');
$::lxdebug->message(LXDebug::WARN(), "Mailer error during 'send': $error");
- return "send email : $error";
+ return $error;
}
# Set defaults & headers
$self->{headers} = [
Subject => $self->{subject},
'Message-ID' => '<' . $self->_create_message_id . '>',
- 'X-Mailer' => "kivitendo $self->{version}",
+ 'X-Mailer' => "kivitendo " . SL::Version->get_version,
];
$self->{mail_attachments} = [];
$self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
$self->{journalentry} = $self->_store_in_journal;
- return $ok ? '' : "send email: $error";
+ return $ok ? '' : ($error || "undefined error");
}
sub _all_recipients {