X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=5dde28db1608161fc8efce9f0bd644bcf174b2d7;hb=4f3393f4faf9b531d48bb97056468eaf5d0676c8;hp=fa19d2547e74f97be02b1602e40c91de85dc831b;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index fa19d2547..5dde28db1 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1109,7 +1109,7 @@ sub validate_items { $lxdebug->enter_sub(); # check if items are valid - if ($form->{rowcount} == 1) { + if ($form->{rowcount} == 0) { &update; exit; } @@ -1256,33 +1256,21 @@ sub edit_e_mail { $form->{print_and_post} = 0; $form->{resubmit} = 0; } - if ($myconfig{role} eq 'admin') { - $bcc = qq| - - | . $locale->text('Bcc') . qq| - - -|; - } - if ($form->{formname} =~ /(pick|packing|bin)_list/) { - $form->{email} = $form->{shiptoemail} if $form->{shiptoemail}; - } + $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; if ($form->{"cp_id"} && !$form->{"email"}) { CT->get_contact(\%myconfig, $form); $form->{"email"} = $form->{"cp_email"}; } - $name = $form->{ $form->{vc} }; - $name =~ s/--.*//g; - $title = $locale->text('E-mail') . " $name"; + $form->{ $form->{vc} } =~ /--/; + $title = $locale->text('E-mail') . " $`"; $form->{oldmedia} = $form->{media}; $form->{media} = "email"; - my %formname_translations = - ( + my %formname_translations = ( "bin_list" => $locale->text('Bin List'), "credit_note" => $locale->text('Credit Note'), "invoice" => $locale->text('Invoice'), @@ -1295,7 +1283,7 @@ sub edit_e_mail { "sales_quotation" => $locale->text('Quotation'), "storno_invoice" => $locale->text('Storno Invoice'), "storno_packing_list" => $locale->text('Storno Packing List'), - ); + ); my $attachment_filename = $formname_translations{$form->{"formname"}}; my $prefix; @@ -1315,107 +1303,26 @@ sub edit_e_mail { $form->{"format"} =~ /opendocument/i ? ".odt" : $form->{"format"} =~ /html/i ? ".html" : ""); $attachment_filename =~ s/ /_/g; - my %umlaute = - ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss" - ); - map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute)); + my %umlaute = ( "ä" => "ae", "ö" => "oe", "ü" => "ue", + "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", "ß" => "ss"); + map { $attachment_filename =~ s/$_/$umlaute{$_}/g } keys %umlaute; } else { $attachment_filename = ""; } - if ($form->{"email"}) { - $form->{"fokus"} = "Form.subject"; - } else { - $form->{"fokus"} = "Form.email"; - } + $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email"; $form->header; - print qq| - - -
+ my (@nh, %nh, @hiddenkeys); + @nh = qw(action email cc bcc subject message formname sendmode format header override); $nh{@nh} = (1)x@nh; + @hidden_keys = grep { !$nh{$_} } grep { !ref $form->{$_} } keys %$form; - - - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - $bcc - - - - - - - -
| . $locale->text('To') . qq|
| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
| . $locale->text('Attachment name') . - qq|
-
- - - - - - - -
| . $locale->text('Message') . qq|
-
-|; - - print_options(); - - map { delete $form->{$_} } - qw(action email cc bcc subject message formname sendmode format header override); - - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| -
- - - -
- -
- - - -|; + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + _print_options_ => print_options('inline'), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); }