Index: openacs-4/packages/dotlrn/www/admin/users-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-oracle.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	4 Dec 2002 09:51:04 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-    <fullquery name="select_non_dotlrn_users_count">
-        <querytext>
-            select count(*)
-            from (select acs_rels.object_id_two
-                  from acs_rels, membership_rels
-                  where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
-		  and acs_rels.rel_id = membership_rels.rel_id
-		  and membership_rels.member_state 
-	              not in ('banned','deleted','rejected')
-                 minus
-                  select acs_rels.object_id_two
-                  from acs_rels, dotlrn_user_types
-                  where acs_rels.object_id_one = dotlrn_user_types.group_id)
-        </querytext>
-    </fullquery>
-
-    <fullquery name="select_deactivated_users_count">
-        <querytext>
-            select count(*)
-            from persons,
-                 acs_rels,
-                 membership_rels
-            where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
-            and acs_rels.object_id_two = persons.person_id
-            and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'banned'
-        </querytext>
-    </fullquery>
-
-</queryset>
Index: openacs-4/packages/dotlrn/www/admin/users-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-postgresql.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/users-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-    <fullquery name="select_non_dotlrn_users_count">
-        <querytext>
-            select count(*)
-            from (select acs_rels.object_id_two
-                  from acs_rels, membership_rels
-                  where acs_rels.object_id_one = (select acs__magic_object_id('registered_users') from dual)
-                  and acs_rels.rel_id = membership_rels.rel_id
-                  and membership_rels.member_state
-                      not in ('banned','deleted','rejected')
-                  and acs_rels.object_id_two not in (                  
-                      select acs_rels.object_id_two
-                             from acs_rels,
-                             dotlrn_user_types
-                       where acs_rels.object_id_one = dotlrn_user_types.group_id)) as foo
-        </querytext>
-    </fullquery>
-
-    <fullquery name="select_deactivated_users_count">
-        <querytext>
-            select count(*)
-            from persons,
-                 acs_rels,
-                 membership_rels
-            where acs_rels.object_id_one = (select acs__magic_object_id('registered_users') from dual)
-            and acs_rels.object_id_two = persons.person_id
-            and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'banned'
-        </querytext>
-    </fullquery>
-
-</queryset>
Index: openacs-4/packages/dotlrn/www/admin/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/dotlrn/www/admin/users.tcl	7 Aug 2017 23:48:09 -0000	1.24
+++ openacs-4/packages/dotlrn/www/admin/users.tcl	29 May 2018 09:05:07 -0000	1.25
@@ -29,8 +29,10 @@
 }
 
 #Pages in this directory are only runnable by dotlrn-wide admins.
-dotlrn::require_admin 
+dotlrn::require_admin
 
+set registered_users_id [acs_magic_object "registered_users"]
+
 set context_bar [_ dotlrn.Users]
 
 set dotlrn_roles [db_list_of_lists select_dotlrn_roles {
Index: openacs-4/packages/dotlrn/www/admin/users.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users.xql	9 Jul 2002 12:39:33 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users.xql	29 May 2018 09:05:07 -0000	1.9
@@ -10,4 +10,34 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="select_non_dotlrn_users_count">
+        <querytext>
+            select count(*)
+            from (select acs_rels.object_id_two
+                  from acs_rels, membership_rels
+                  where acs_rels.object_id_one = :registered_users_id
+                  and acs_rels.rel_id = membership_rels.rel_id
+                  and membership_rels.member_state
+                      not in ('banned','deleted','rejected')
+                  and acs_rels.object_id_two not in (                  
+                      select acs_rels.object_id_two
+                             from acs_rels,
+                             dotlrn_user_types
+                       where acs_rels.object_id_one = dotlrn_user_types.group_id)) as foo
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_deactivated_users_count">
+        <querytext>
+            select count(*)
+            from persons,
+                 acs_rels,
+                 membership_rels
+            where acs_rels.object_id_one = :registered_users_id
+            and acs_rels.object_id_two = persons.person_id
+            and acs_rels.rel_id = membership_rels.rel_id
+            and membership_rels.member_state = 'banned'
+        </querytext>
+    </fullquery>
+    
 </queryset>