Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	5 Apr 2002 00:16:38 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	7 Apr 2002 01:16:52 -0000	1.10
@@ -38,6 +38,7 @@
         where parties.party_id = users.user_id
         and users.user_id = persons.person_id
         and persons.person_id = acs_rels.object_id_two
+        and 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'
         and not exists (select 1
@@ -51,19 +52,25 @@
 
     <fullquery name="select_deactivated_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        select users.user_id,
+               persons.first_names,
+               persons.last_name,
+               parties.email,
                'limited' as access_level,
                'f' as read_private_data_p,
-               acs_permission.permission_p(:root_object_id, cc_users.user_id, 'admin') as site_wide_admin_p
-        from cc_users
-        where not exists (select 1
-                          from dotlrn_users
-                          where dotlrn_users.user_id = cc_users.user_id)
-        and cc_users.member_state = 'banned'
-        order by cc_users.last_name
+               acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p
+        from parties,
+             users,
+             persons,
+             acs_rels,
+             membership_rels
+        where parties.party_id = users.user_id
+        and users.user_id = persons.person_id
+        and persons.person_id = acs_rels.object_id_two
+        and 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 = 'banned'
+        order by persons.last_name
       </querytext>
     </fullquery>