restart apache2 in postinst

[mfinanz.git] / SL / Common.pm

diff --git a/SL/Common.pm b/SL/Common.pm
index 15f8f7b93f2d94ba9b30ea53a7ec16425207cefe..3b2df5bc9661073f0b417a05321215c0c4b4a42d 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -25,6 +25,7 @@ use Encode qw(decode);
 
 use SL::DBUtils;
 use SL::DB;
+use SL::HTML::Util;
 
 sub unique_id {
   my ($a, $b) = gettimeofday();
@@ -339,7 +340,7 @@ sub get_vc_details {
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_} * 1) } qw(discount creditlimit);
 
-  $query = qq|SELECT * FROM shipto WHERE (trans_id = ?)|;
+  $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND module LIKE 'CT'|;
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $vc_id);
 
   if ($vc eq 'customer') {
@@ -387,6 +388,8 @@ sub save_email_status {
 
   my ($self, $myconfig, $form) = @_;
 
+  return unless ($::instance_conf->get_email_journal);
+
   my ($table, $query, $dbh);
 
   if ($form->{script} eq 'oe.pl') {
@@ -423,7 +426,7 @@ sub save_email_status {
       . $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;
 
@@ -645,6 +648,11 @@ C<full> (replace consecutive line feed/carriage return characters in
 the middle by a single space and remove tailing line feed/carriage
 return characters).
 
+=item C<save_email_status>
+
+Adds sending information to internal notes.
+Does nothing if the client config email_journal is enabled.
+
 =back
 
 =head1 BUGS