Index: openacs-4/packages/mail-tracking/catalog/mail-tracking.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/catalog/mail-tracking.de_DE.ISO-8859-1.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/mail-tracking/catalog/mail-tracking.de_DE.ISO-8859-1.xml	14 Jun 2005 20:40:55 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="mail-tracking" package_version="0.3d" locale="de_DE" charset="ISO-8859-1">
+
+  <msg key="Body">Inhalt</msg>
+  <msg key="messages">Nachrichten</msg>
+  <msg key="Package">Paket</msg>
+  <msg key="Recipient">Empf�nger</msg>
+  <msg key="Request_mail_tracking_for_instance_name">Mail Tracking f�r %instance_name% einrichten</msg>
+  <msg key="Sent_Date">Versanddatum</msg>
+  <msg key="Subject">Betreff</msg>
+  <msg key="You_have_requested_to_track_emails_from_this_package">Sie haben das Mail Tracking f�r diese Paket aktiviert (&lt;a href=&quot;%sub_url%&quot;&gt;deaktivieren&lt;/a&gt;).</msg>
+  <msg key="You_may_request_mail_tracking_for_this_package">Sie k�nnen &lt;a href=&quot;%sub_url%&quot;&gt; das Mail Tracking f�r dieses Paket aktivieren&lt;/a&gt;: '%pretty_name%'.</msg>
+</message_catalog>
Index: openacs-4/packages/mail-tracking/catalog/mail-tracking.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/catalog/mail-tracking.en_US.ISO-8859-1.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/mail-tracking/catalog/mail-tracking.en_US.ISO-8859-1.xml	14 Jun 2005 20:40:55 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="mail-tracking" package_version="0.3b" locale="en_US" charset="ISO-8859-1">
+
+  <msg key="Body">Body</msg>
+  <msg key="messages">messages</msg>
+  <msg key="Package">Package</msg>
+  <msg key="Recipient">Recipient</msg>
+  <msg key="Request_mail_tracking_for_instance_name">Request mail tracking for %instance_name%</msg>
+  <msg key="Request_Notification_for_instance_name">Request Notification for %instance_name%</msg>
+  <msg key="Sender">Sender</msg>
+  <msg key="Sent_Date">Sent Date</msg>
+  <msg key="Subject">Subject</msg>
+  <msg key="You_have_requested_to_track_emails_from_this_package">You have requested to track emails from this package (&lt;a href=&quot;%sub_url%&quot;&gt;unsubscribe&lt;/a&gt;).</msg>
+  <msg key="You_may_request_mail_tracking_for_this_package">You may &lt;a href=&quot;%sub_url%&quot;&gt;request mail tracking&lt;/a&gt; for this package: '%pretty_name%'.</msg>
+</message_catalog>
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.1 -r1.2
--- openacs-4/packages/mail-tracking/lib/messages.tcl	14 Jun 2005 19:48:53 -0000	1.1
+++ openacs-4/packages/mail-tracking/lib/messages.tcl	14 Jun 2005 20:40:55 -0000	1.2
@@ -20,29 +20,6 @@
     context:onevalue
 }
 
-set sender_p [exists_and_not_null sender_id]
-set receiver_p [exists_and_not_null receiver_id]
-set package_p [exists_and_not_null package_id]
-set sum_p [expr $sender_p + $receiver_p + $package_p]
-
-if {$sender_p} {
-    set sender_id_clause "and sender_id = :sender_id"
-} else {
-    set sender_id_clause ""
-}
-
-if {$receiver_p} {
-    set recipient_id_clause "and recipient_id = :recipient_id"
-} else {
-    set recipient_id_clause ""
-}
-
-if {$package_p} {
-    set package_id_clause "and package_id = :package_id"
-} else {
-    set package_id_clause ""
-}
-
 set page_title [ad_conn instance_name]
 set context [list "index"]
 
@@ -81,7 +58,19 @@
 	subject {orderby subject}
 	sent_date {orderby sent_date}
     } -filters {
-	acs_mail_log_id
+	recipient_id {
+	    label "[_ mail-tracking.Recipient]"
+	    where_clause {recipient_id = :recipient_id}
+	}
+	sender_id {
+	    label "[_ mail-tracking.Sender]"
+	    where_clause "sender_id = :sender_id"
+	}
+	package_id {
+	    label "[_ mail-tracking.Package]"
+	    where_clause "package_id = :package_id"	
+	}
+
     }
 
 set orderby [template::list::orderby_clause -name "messages" -orderby]
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.1 -r1.2
--- openacs-4/packages/mail-tracking/lib/messages.xql	14 Jun 2005 19:48:53 -0000	1.1
+++ openacs-4/packages/mail-tracking/lib/messages.xql	14 Jun 2005 20:40:55 -0000	1.2
@@ -8,10 +8,8 @@
          select message_id, sender_id, recipient_id, package_id, sent_date, body, subject 
         from acs_mail_log
 	where message_id <> 0
-	$recipient_id_clause
-	$sender_id_clause
-	$package_id_clause
-	$orderby
+        [template::list::filter_where_clauses -and -name messages]
+        [template::list::orderby_clause -orderby -name messages]
         </querytext>
     </fullquery>