[interchange-cvs] interchange - heins modified code/UserTag/email.tag

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Sat Feb 2 16:40:00 2002


User:      heins
Date:      2002-02-02 21:39:25 GMT
Modified:  code/UserTag email.tag
Log:
	* Add enhancement made by Jurgen Botz to use send_mail program
	  so that Net::SMTP can send the email tag. Thanks Jurgen!

Revision  Changes    Path
1.2       +4 -12     interchange/code/UserTag/email.tag


rev 1.2, prev_rev 1.1
Index: email.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UserTag/email.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- email.tag	29 Jan 2002 05:52:42 -0000	1.1
+++ email.tag	2 Feb 2002 21:39:25 -0000	1.2
@@ -6,6 +6,7 @@
 sub {
     my ($to, $subject, $reply, $from, $extra, $opt, $body) = @_;
     my $ok = 0;
+    my @extra;
 
     $subject = '<no subject>' unless defined $subject && $subject;
 
@@ -15,21 +16,12 @@
 		$from = $Vend::Cfg->{MailOrderTo};
 		$from =~ s/,.*//;
 	}
-
 	$extra =~ s/\s*$/\n/ if $extra;
+        $extra .= "From: $from\n" if $from;
+	@extra = split('\n', $extra);
 
     SEND: {
-        open(Vend::MAIL,"|$Vend::Cfg->{SendMailProgram} -t") or last SEND;
-        print Vend::MAIL
-			"To: $to\n",
-			"From: $from\n",
-			$reply,
-			$extra || '',
-			"Subject: $subject\n\n",
-			$body
-            or last SEND;
-        close Vend::MAIL or last SEND;
-        $ok = ($? == 0);
+            $ok = send_mail($to, $subject, $body, $reply, 0, @extra);
     }
 
     if (!$ok) {