Index: openacs-4/packages/ecommerce/tcl/qmail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/qmail-procs.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/ecommerce/tcl/qmail-procs.tcl 12 Sep 2002 22:44:26 -0000 1.3 +++ openacs-4/packages/ecommerce/tcl/qmail-procs.tcl 14 May 2003 19:56:34 -0000 1.3.2.1 @@ -12,34 +12,5 @@ @author jsc @creation-date 1999-01-15 } { - set msg "To: $to\nFrom: $from\nSubject: $subject\nDate: [ns_httptime [ns_time]]" - ## Insert extra headers, if any - if ![string match "" $extraheaders] { - set size [ns_set size $extraheaders] - for {set i 0} {$i < $size} {incr i} { - append msg "\n[ns_set key $extraheaders $i]: [ns_set value $extraheaders $i]" - } - } - - append msg "\n\n$body" - - # Specify the envelope sender address so that we don't see the default - # Return-Path of anonymous@host.domain - if [regexp {.*<(.*)>} $from ig address] { - set from $address - } - - # -h says use header fields for recipients - set qmail_pipe [open "| /var/qmail/bin/qmail-inject -h -f$from" "w"] - puts -nonewline $qmail_pipe $msg - close $qmail_pipe + ns_sendmail $to $from $subject $body $extraheaders } - -# Inject a fully formed message into qmail. -ad_proc qmail_send_complete_message {from msg} { - sends message using qmail - } { - set qmail_pipe [open "| /var/qmail/bin/qmail-inject -h -f$from" "w"] - puts -nonewline $qmail_pipe $msg - close $qmail_pipe -}