Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/dotlrn/www/spam.tcl	14 Jan 2003 20:23:00 -0000	1.17.2.2
+++ openacs-4/packages/dotlrn/www/spam.tcl	3 Feb 2003 03:54:33 -0000	1.17.2.3
@@ -79,7 +79,7 @@
     -label {Send Date} \
     -datatype date \
     -widget date \
-    -format {MONTH DD YYYY HH12:MI AM} \
+    -format {MONTH DD YYYY HH12 MI AM} \
     -value [template::util::date::now]
 
 element create spam_message referer \
@@ -98,49 +98,7 @@
 
     set safe_community_name [db_quote $community_name]
 
-    set query "
-        select '$from' as from_addr,
-               '$sender_first_names' as sender_first_names,
-               '$sender_last_name' as sender_last_name,
-               parties.email,
-               decode(acs_objects.object_type,
-                      'user',
-                      (select first_names
-                       from persons
-                       where person_id = parties.party_id),
-                      'group',
-                      (select group_name
-                       from groups
-                       where group_id = parties.party_id),
-                      'rel_segment',
-                      (select segment_name
-                       from rel_segments
-                       where segment_id = parties.party_id),
-                      '') as first_names,
-               decode(acs_objects.object_type,
-                      'user',
-                      (select last_name
-                       from persons
-                       where person_id = parties.party_id),
-                      '') as last_name,
-               '$safe_community_name' as community_name,
-               '$community_url' as community_url
-            from party_approved_member_map,
-                 parties,
-                 acs_objects
-            where party_approved_member_map.party_id = $segment_id
-            and party_approved_member_map.member_id <> $segment_id
-            and party_approved_member_map.member_id = parties.party_id
-            and parties.party_id = acs_objects.object_id
-            and parties.party_id in (select acs_rels.object_id_two  
-                                     from acs_rels, membership_rels
-                                     where acs_rels.object_id_one = 
-                                        acs.magic_object_id('registered_users')
-                                     and acs_rels.rel_id = 
-                                        membership_rels.rel_id
-                                     and membership_rels.member_state 
-                                        = 'approved')
-    "
+    set query [db_map sender_info]
 
 ns_log notice "query: $query"