use SL::DBUtils;
use SL::DB;
+use SL::HTML::Util;
sub unique_id {
my ($a, $b) = gettimeofday();
$query = qq|SELECT * FROM shipto WHERE (trans_id = ?)|;
$form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $vc_id);
+ if ($vc eq 'customer') {
+ $query = qq|SELECT * FROM additional_billing_addresses WHERE (customer_id = ?)|;
+ $form->{ADDITIONAL_BILLING_ADDRESSES} = selectall_hashref_query($form, $dbh, $query, $vc_id);
+ }
+
$query = qq|SELECT * FROM contacts WHERE (cp_cv_id = ?)|;
$form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id);
. $main::locale->text('To (email)') . ": $form->{email}\n"
. "${cc}${bcc}"
. $main::locale->text('Subject') . ": $form->{subject}\n\n"
- . $main::locale->text('Message') . ": $form->{message}";
+ . $main::locale->text('Message') . ": " . SL::HTML::Util->strip($form->{message});
$intnotes =~ s|\r||g;
foreach my $item (qw(tmpdir tmpfile type)){
next if $form->{$item};
$::lxdebug->message(LXDebug::WARN(), 'Missing parameter:' . $item);
- $::form->error($::locale->text("Missing parameter for WebDAV file copy"));
+ $::lxdebug->leave_sub();
+ return $::locale->text("Missing parameter for WebDAV file copy");
}
my ($webdav_folder, $document_name) = get_webdav_folder($form);
if (! $webdav_folder){
- $::lxdebug->leave_sub();
$::lxdebug->message(LXDebug::WARN(), 'Cannot check correct WebDAV folder');
- $::form->error($::locale->text("Cannot check correct WebDAV folder"));
- return undef;
+ $::lxdebug->leave_sub();
+ return $::locale->text("Cannot check correct WebDAV folder")
}
$complete_path = File::Spec->catfile($form->{cwd}, $webdav_folder);
chdir($current_dir);
}
- opendir my $dh, $complete_path or die "Could not open $complete_path: $!";
+ my $dh;
+ if (!opendir $dh, $complete_path) {
+ $::lxdebug->leave_sub();
+ return "Could not open $complete_path: $!";
+ }
my ($newest_name, $newest_time);
while ( defined( my $file = readdir( $dh ) ) ) {
return;
}
+ $form->{attachment_filename} ||= $form->generate_attachment_filename;
+
my $timestamp = get_current_formatted_time();
- my $new_file = File::Spec->catfile($form->{cwd}, $webdav_folder, $form->generate_attachment_filename());
+ my $new_file = File::Spec->catfile($form->{cwd}, $webdav_folder, $form->{attachment_filename});
$new_file =~ s{(.*)\.}{$1$timestamp\.};
if (!File::Copy::copy($current_file, $new_file)) {
$::lxdebug->message(LXDebug::WARN(), "Copy file from $current_file to $new_file failed: $ERRNO");
- $::form->error($::locale->text("Copy file from #1 to #2 failed: #3", $current_file, $new_file, $ERRNO));
+ $::lxdebug->leave_sub();
+ return $::locale->text("Copy file from #1 to #2 failed: #3", $current_file, $new_file, $ERRNO);
}
+ return;
$::lxdebug->leave_sub();
}