$additional_params ||= { };
my $real_file = $self->_prepare_html_template($file, $additional_params);
- my $template = $self->template || $self->init_template;
+ my $template = $self->template;
map { $additional_params->{$_} ||= $self->{$_} } keys %{ $self };
return $output;
}
-sub init_template {
- my $self = shift;
-
- return $self->template if $self->template;
-
- # Force scripts/locales.pl to pick up the exception handling template.
- # parse_html_template('generic/exception')
- return $self->template(Template->new({
- 'INTERPOLATE' => 0,
- 'EVAL_PERL' => 0,
- 'ABSOLUTE' => 1,
- 'CACHE_SIZE' => 0,
- 'PLUGIN_BASE' => 'SL::Template::Plugin',
- 'INCLUDE_PATH' => '.:templates/webpages',
- 'COMPILE_EXT' => '.tcc',
- 'COMPILE_DIR' => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
- 'ERROR' => 'templates/webpages/generic/exception.html',
- 'ENCODING' => 'utf8',
- })) || die;
-}
-
-sub template {
- my $self = shift;
- $self->{template_object} = shift if @_;
- return $self->{template_object};
-}
+sub template { $::request->presenter->get_template }
sub show_generic_error {
$main::lxdebug->enter_sub();
if ( !$self->{preview} && $ext_for_format eq 'pdf' && $::instance_conf->get_doc_storage) {
$self->{attachment_filename} ||= $self->generate_attachment_filename;
- $self->{print_file_id} = $self->store_pdf($self);
+ $self->{print_file_id} = $self->store_pdf($self)->id;
}
if ($self->{media} eq 'email') {
if ( getcwd() eq $self->{"tmpdir"} ) {
sub get_bcc_defaults {
my ($self, $myconfig, $mybcc) = @_;
-# if (SL::DB::Default->get->bcc_to_login) {
-# $mybcc .= ", " if $mybcc;
-# $mybcc .= $myconfig->{email};
-# }
+ if (SL::DB::Default->get->bcc_to_login) {
+ $mybcc .= ", " if $mybcc;
+ $mybcc .= $myconfig->{email};
+ }
my $otherbcc = SL::DB::Default->get->global_bcc;
if ($otherbcc) {
$mybcc .= ", " if $mybcc;
}
}
foreach my $attfile ( @attfiles ) {
- push @{ $mail->{attachments} }, { path => SL::File->get_file_path(dbfile => $attfile),
- id => $attfile->id,
- type => $attfile->file_mime_type,
- name => $attfile->file_name };
+ push @{ $mail->{attachments} }, { path => $attfile->get_file,
+ id => $attfile->id,
+ type => $attfile->mime_type,
+ name => $attfile->file_name,
+ content => $attfile->get_content };
}
}
$mail->{message} =~ s/\r//g;