Index: openacs-4/packages/mail-tracking/lib/messages.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/lib/messages.xql,v diff -u -r1.9.2.4 -r1.9.2.5 --- openacs-4/packages/mail-tracking/lib/messages.xql 23 Jun 2006 06:50:06 -0000 1.9.2.4 +++ openacs-4/packages/mail-tracking/lib/messages.xql 16 Oct 2006 07:41:52 -0000 1.9.2.5 @@ -24,7 +24,7 @@ - select distinct ml.log_id, sent_date + select distinct ml.log_id, sent_date, package_id, subject, sender_id from acs_mail_log ml left outer join acs_mail_log_recipient_map mlrm on (ml.log_id=mlrm.log_id) where 1=1 $recipient_where_clause Index: openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql,v diff -u -r1.7.2.5 -r1.7.2.6 --- openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 26 Jun 2006 10:27:01 -0000 1.7.2.5 +++ openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 16 Oct 2006 07:41:52 -0000 1.7.2.6 @@ -33,6 +33,7 @@ -- Only used for those emails that do not have a party_id in openacs. cc varchar(4000), bcc varchar(4000), + to_addr varchar(4000), sent_date timestamp); create index acs_mail_log_object_idx on acs_mail_log(object_id); Index: openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl,v diff -u -r1.5.2.4 -r1.5.2.5 --- openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl 23 Jun 2006 06:50:06 -0000 1.5.2.4 +++ openacs-4/packages/mail-tracking/tcl/mail-tracking-procs.tcl 16 Oct 2006 07:41:52 -0000 1.5.2.5 @@ -63,21 +63,12 @@ set log_id [db_nextval "acs_object_id_seq"] # First create the message entry - set log_id [db_exec_plsql insert_log_entry {select acs_mail_log__new ( - :log_id, - :message_id, - :sender_id, - :package_id, - :subject, - :body, - :sender_id, - :creation_ip, - :context_id, - :object_id, - :cc_addr, - :bcc_addr, - :to_addr - )}] + db_dml insert_mail_log { + insert into acs_mail_log + (log_id, message_id, sender_id, package_id, subject, body, sent_date, object_id, cc, bcc, to_addr) + values + (:log_id, :message_id, :sender_id, :package_id, :subject, :body, now(), :object_id, :cc_addr, :bcc_addr, :to_addr) + } ns_log Debug "Mail Traking OBJECT $object_id CONTEXT $context_id FILES $file_ids LOGS $log_id" foreach file_id $file_ids { Index: openacs-4/packages/mail-tracking/www/one-message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/www/one-message.tcl,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/mail-tracking/www/one-message.tcl 23 Jun 2006 06:50:06 -0000 1.8.2.3 +++ openacs-4/packages/mail-tracking/www/one-message.tcl 16 Oct 2006 07:41:52 -0000 1.8.2.4 @@ -85,6 +85,7 @@ # We get the related files set tracking_url [apm_package_url_from_key "mail-tracking"] +set download_files [list] set files [db_list files {}] foreach file_id $files { set title [content::item::get_title -item_id $file_id]