Index: openacs-4/packages/dotlrn/www/spam-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-oracle.xql,v
diff -u -r1.2.6.3 -r1.2.6.4
--- openacs-4/packages/dotlrn/www/spam-oracle.xql	11 Aug 2004 22:45:06 -0000	1.2.6.3
+++ openacs-4/packages/dotlrn/www/spam-oracle.xql	14 Sep 2004 15:34:27 -0000	1.2.6.4
@@ -6,8 +6,8 @@
     <fullquery name="sender_info">
         <querytext>
         select '$from' as from_addr,
-               '$sender_first_names' as sender_first_names,
-               '$sender_last_name' as sender_last_name,
+               '[db_quote $sender_first_names]' as sender_first_names,
+               '[db_quote $sender_last_name]' as sender_last_name,
                parties.email,
                decode(acs_objects.object_type,
                       'user',
@@ -36,7 +36,8 @@
                  acs_objects
             where (acs_rels.object_id_one = $community_id
             and acs_rels.object_id_two = parties.party_id
-            $query_restriction
+            and (acs_rels.rel_type in ($rel_types_str)
+	         or acs_rels.object_id_two in ($recipients_str))
 	    and parties.party_id = acs_objects.object_id
             and parties.party_id in (select acs_rels.object_id_two  
                                      from acs_rels, membership_rels