X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FMisc.pm;h=98490acfb4503212746c3f73fbd8d4456c931d47;hb=2b7d11d0b79821a0c7f39ce8777b6aa91d37a26e;hp=1bb1ae152f52613b0f507f8f319369bb118c99db;hpb=691a587e56557208e9b3834c77f36ca47f3a1a25;p=freeside.git

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 1bb1ae152..98490acfb 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw ( @ISA @EXPORT_OK $DEBUG );
 use Exporter;
 use Carp;
+use Data::Dumper;
 
 @ISA = qw( Exporter );
 @EXPORT_OK = qw( send_email send_fax );
@@ -69,6 +70,12 @@ FS::UID->install_callback( sub {
 
 sub send_email {
   my(%options) = @_;
+  if ( $DEBUG ) {
+    my %doptions = %options;
+    $doptions{'body'} = '(full body not shown in debug)';
+    warn "FS::Misc::send_email called with options:\n  ". Dumper(\%doptions);
+#         join("\n", map { "  $_: ". $options{$_} } keys %options ). "\n"
+  }
 
   $ENV{MAILADDRESS} = $options{'from'};
   my $to = ref($options{to}) ? join(', ', @{ $options{to} } ) : $options{to};
@@ -118,8 +125,15 @@ sub send_email {
 
   }
 
-  $options{'from'} =~ /\@([\w\.\-]+)/ or $1 = 'example.com';
-  my $message_id = join('.', rand()*(2**32), $$, time). "\@$1";
+  my $domain;
+  if ( $options{'from'} =~ /\@([\w\.\-]+)/ ) {
+    $domain = $1;
+  } else {
+    warn 'no domain found in invoice from address '. $options{'from'}.
+         '; constructing Message-ID @example.com'; 
+    $domain = 'example.com';
+  }
+  my $message_id = join('.', rand()*(2**32), $$, time). "\@$domain";
 
   my $message = MIME::Entity->build(
     'From'       => $options{'from'},