Index: openacs-4/packages/mail-tracking/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/lib/messages.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/mail-tracking/lib/messages.tcl 13 Jun 2006 06:40:49 -0000 1.29
+++ openacs-4/packages/mail-tracking/lib/messages.tcl 17 Nov 2006 10:39:37 -0000 1.30
@@ -211,11 +211,19 @@
db_multirow -extend { file_ids object_url sender_name recipient package_name package_url url_message_id download_files} messages select_messages { } {
- set sender_name [party::name -party_id $sender_id]
+ if {$sender_id eq ""} {
+ set sender_name ""
+ } else {
+ set sender_name [party::name -party_id $sender_id]
+ }
+
set reciever_list [list]
- db_foreach reciever_id {select recipient_id from acs_mail_log_recipient_map where type ='to' and log_id = :log_id and recipient_id is not null} {
+ set reciever_list [db_list get_recievers {select recipient_id from acs_mail_log_recipient_map where type ='to' and log_id = :log_id and recipient_id is not null}]
+
+ foreach recipient_id $reciever_list {
lappend reciever_list [party::name -party_id $recipient_id]
}
+
set recipient [join $reciever_list "
"]
if {[exists_and_not_null package_id]} {
@@ -247,20 +255,10 @@
set subject "$before$result$after"
}
- set files [list]
- # We get the related files for all the object_types
- set content_types [list content_revision content_item file_storage_object image]
- db_foreach files {} {
- if { [string equal $content_type "content_revision"] } {
- set file [item::get_item_from_revision $file_id]
- } else {
- set file $file_id
- }
- set title [content::item::get_title -item_id $file]
- if { [empty_string_p $title] } {
- set title [acs_object_name $file]
- }
- append download_files "$title
"
+ set files [db_list files {}]
+ foreach file_id $files {
+ set title [content::item::get_title -item_id $file_id]
+ append download_files "$title
"
}
set object_url "/o/$object_id"