X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=59d69c37c2e5b72dc83eb4c44fd2bd04abb402dd;hb=e6795d92afc3786c7f2cea73cff6da8986194987;hp=b9835881d49d92290860f64bf563ee69dd030a37;hpb=678992ffad65c5d10c52552792edee0a2a708bfd;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index b9835881d..59d69c37c 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -150,7 +150,7 @@ sub _flatten_variables_rec {
$first_array_entry = 0;
}
} else {
- @result = ({ 'key' => $prefix . $key . ($first_array_entry ? '[+]' : '[]'), 'value' => $element });
+ push @result, { 'key' => $prefix . $key . '[]', 'value' => $element };
}
}
}
@@ -249,7 +249,7 @@ sub hide_form {
sub throw_on_error {
my ($self, $code) = @_;
- local $self->{__ERROR_HANDLER} = sub { die SL::X::FormError->new($_[0]) };
+ local $self->{__ERROR_HANDLER} = sub { SL::X::FormError->throw(error => $_[0]) };
$code->();
}
@@ -311,9 +311,9 @@ sub numtextrows {
sub dberror {
my ($self, $msg) = @_;
- die SL::X::DBError->new(
- msg => $msg,
- error => $DBI::errstr,
+ SL::X::DBError->throw(
+ msg => $msg,
+ db_error => $DBI::errstr,
);
}
@@ -1110,7 +1110,7 @@ sub send_email {
my @attfiles;
# if we send html or plain text inline
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
- $mail->{contenttype} = "text/html";
+ $mail->{content_type} = "text/html";
$mail->{message} =~ s/\r//g;
$mail->{message} =~ s/\n/
\n/g;
$full_signature =~ s/\n/
\n/g;
@@ -1344,7 +1344,7 @@ sub generate_email_subject {
sub generate_email_body {
$main::lxdebug->enter_sub();
- my ($self) = @_;
+ my ($self, %params) = @_;
# simple german and english will work grammatically (most european languages as well)
# Dear Mr Alan Greenspan:
# Sehr geehrte Frau Meyer,
@@ -1352,7 +1352,7 @@ sub generate_email_body {
# Gentile Signora Ferrari,
my $body = '';
- if ($self->{cp_id}) {
+ if ($self->{cp_id} && !$params{record_email}) {
my $givenname = SL::DB::Contact->load_cached($self->{cp_id})->cp_givenname; # for qw(gender givename name);
my $name = SL::DB::Contact->load_cached($self->{cp_id})->cp_name; # for qw(gender givename name);
my $gender = SL::DB::Contact->load_cached($self->{cp_id})->cp_gender; # for qw(gender givename name);