Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 30 Sep 2005 20:42:56 -0000 1.33 +++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 30 Sep 2005 21:37:02 -0000 1.34 @@ -891,7 +891,7 @@ {-extraheaders ""} {-bcc ""} {-package_id ""} - -no_callback:boolean + -no_callback_p:boolean } { Reliably send an email message. @@ -904,7 +904,7 @@ @option extraheaders extra mail headers in an ns_set @option bcc see to_addr @option package_id To be used for calling a package-specific proc when mail has bounced - @option no_callback Boolean that indicates if callback should be executed or not. Set to "t" if you don't want to execute callbacks, or "f" otherwise, Default "t". + @option no_callback_p Boolean that indicates if callback should be executed or not. If you don't provide it it will execute callbacks @returns the Message-Id of the mail } { ## Extract "from" email address @@ -988,16 +988,16 @@ {-folder_id ""} {-mime_type "text/plain"} {-object_id ""} - -no_callback:boolean + -no_callback_p:boolean } { - + Prepare an email to be send with the option to pass in a list of file_ids as well as specify an html_body and a mime_type @param send_immediately The email is send immediately and not stored in the acs_mail_lite_queue @param to_addr Email address to send the mail to - + @param from_addr Who is sending the email @param subject of the email @@ -1013,12 +1013,11 @@ @param mime_type MIME Type of the mail to send out. Can be "text/plain", "text/html". @param object_id The ID of the object that is responsible for sending the mail in the first place + + @param no_callback_p Boolean that indicates if callback should be executed or not. If you don't provide it it will execute callbacks - @param no_callback Boolean that indicates if callback should be executed or not. Set to "t" if you don't want to execute callbacks, or "f" otherwise, Default "t". - } { - # Set the message token set message_token [mime::initialize -canonical "$mime_type" -string "$body"] @@ -1057,7 +1056,8 @@ set package_id [apm_package_id_from_key "acs-mail-lite"] } - if { !$no_callback_p } { + if { ![exists_and_not_null no_callback_p] } { + callback acs_mail_lite::complex_send \ -package_id $package_id \ -from_party_id [party::get_by_email -email $from_addr] \