Commit f4d80950 authored by Frank Bergmann's avatar Frank Bergmann

- V4.0.3.0.0:

  Updated to OpenACS 5.7
parent c87b6bdb
......@@ -25,7 +25,7 @@
<fullquery name="messages_pagination">
<querytext>
select distinct ml.log_id, sent_date
select distinct ml.log_id, ml.sent_date, ml.sender_id, ml.package_id, ml.subject
from acs_mail_log ml left outer join acs_mail_log_recipient_map mlrm on (ml.log_id=mlrm.log_id)
where ml.log_id is not null
$recipient_where_clause
......
......@@ -2,7 +2,6 @@
<!-- Generated by the OpenACS Package Manager -->
<package key="mail-tracking" url="http://openacs.org/repository/apm/packages/mail-tracking" type="apm_service">
<license>GPL V2.0 or any later version</license>
<package-name>Mail Tracking</package-name>
<pretty-plural>Mail Tracking</pretty-plural>
<initial-install-p>f</initial-install-p>
......
......@@ -42,6 +42,7 @@ create table acs_mail_log (
create index acs_mail_log_object_idx on acs_mail_log(object_id);
create index acs_mail_log_sender_idx on acs_mail_log(sender_id);
create index acs_mail_log_object_message_idx on acs_mail_log(object_id,message_id);
create table acs_mail_log_recipient_map (
recipient_id integer constraint
......
......@@ -12,7 +12,7 @@ ad_library {
ad_proc -public -callback acs_mail_lite::complex_send -impl mail_tracking {
{-package_id:required}
{-from_party_id:required 0}
{-from_party_id:required}
{-from_addr ""}
{-to_party_ids ""}
{-cc_party_ids ""}
......@@ -58,7 +58,7 @@ ad_proc -public -callback acs_mail_lite::complex_send -impl mail_tracking {
ad_proc -public -callback acs_mail_lite::send -impl mail_tracking {
{-package_id:required}
{-from_party_id:required 0}
{-from_party_id:required}
{-to_party_id:required}
{-body:required}
{-message_id:required}
......
......@@ -17,7 +17,6 @@ ad_page_contract {
}
# We need to figure out a way to detect which contacts package a party_id belongs to
set contacts_package_id [apm_package_id_from_key contacts]
set page_title "[_ mail-tracking.One_message]"
set context [list]
......@@ -36,6 +35,7 @@ if {![exists_and_not_null cc]} {
}
if {[exists_and_not_null sender_id]} {
set contacts_package_id [contact::package_id -party_id $sender_id]
if {$contacts_package_id} {
set sender "<a href=\"[contact::url -party_id $sender_id -package_id $contacts_package_id]\">[party::name -party_id $sender_id]</a>"
} else {
......@@ -99,4 +99,4 @@ set download_files [join $download_files ", "]
if {![ad_looks_like_html_p $body]} {
set body "<pre>$body</pre>"
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment