X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=8d8f41768fb8ecd1e795d67c156d62f348683dd3;hb=555e9ec5607fe2107040f7122f55a76471fe1901;hp=921cb253ef452fc884e8220db702479d91c9796a;hpb=5202b3e71b817c6a78845cd4c27773760ff408b6;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 921cb253e..8d8f41768 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -450,6 +450,7 @@ sub header {
push @header, " " if $self->{landscape};
push @header, "" if -f $self->{favicon};
push @header, map { qq|| } $layout->javascripts;
+ push @header, '';
push @header, $self->{javascript} if $self->{javascript};
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
@@ -549,8 +550,10 @@ sub _prepare_html_template {
}
$language = "de" unless ($language);
- if (-f "templates/webpages/${file}.html") {
- $file = "templates/webpages/${file}.html";
+ my $webpages_path = $::request->layout->webpages_path;
+
+ if (-f "${webpages_path}/${file}.html") {
+ $file = "${webpages_path}/${file}.html";
} elsif (ref $file eq 'SCALAR') {
# file is a scalarref, use inline mode
@@ -1002,6 +1005,14 @@ sub send_email {
map { $mail->{$_} = $self->{$_} }
qw(cc subject message format);
+ if ($self->{cc_employee}) {
+ my ($user, $my_emp_cc);
+ $user = SL::DB::Manager::AuthUser->find_by(login => $self->{cc_employee});
+ $my_emp_cc = $user->get_config_value('email') if ref $user eq 'SL::DB::AuthUser';
+ $mail->{cc} .= ", " if $mail->{cc};
+ $mail->{cc} .= $my_emp_cc if $my_emp_cc;
+ }
+
$mail->{bcc} = $self->get_bcc_defaults($myconfig, $self->{bcc});
$mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
$mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|;