Index: openacs-4/packages/dotlrn/www/admin/users-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.tcl,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/dotlrn/www/admin/users-search.tcl	21 Jan 2003 18:50:47 -0000	1.24
+++ openacs-4/packages/dotlrn/www/admin/users-search.tcl	21 Feb 2004 02:36:51 -0000	1.24.2.1
@@ -23,7 +23,7 @@
 } -query {
     {type "any"}
     {can_browse_p "any"}
-    {private_data_p "any"}
+    {guest_p "any"}
     {join_criteria "and"}
     {n_users 0}
     {action "none"}
@@ -108,12 +108,12 @@
     -options [list [list [_ dotlrn.Any] any] [list [_ dotlrn.Limited] 0] [list [_ dotlrn.Full] 1]] \
     -value $can_browse_p
 
-element create user_search private_data_p \
+element create user_search guest_p \
     -label "[_ dotlrn.Guest_1]" \
     -datatype text \
     -widget select \
-    -options [list [list [_ dotlrn.Any] any] [list [_ dotlrn.Yes] f] [list [_ dotlrn.No] t]] \
-    -value $private_data_p
+    -options [list [list [_ dotlrn.Any] any] [list [_ dotlrn.Yes] t] [list [_ dotlrn.No] f]] \
+    -value $guest_p
 
 element create user_search role \
     -label "[_ dotlrn.Role]" \
@@ -147,7 +147,7 @@
 
 if {[form is_valid user_search]} {
     form get_values user_search \
-        id type can_browse_p private_data_p last_visit_greater last_visit_less name join_criteria
+        id type can_browse_p guest_p last_visit_greater last_visit_less name join_criteria
 
     if {([string equal "and" $join_criteria] == 0) && ([string equal "or" $join_criteria] == 0)} {
         ad_return_error \
@@ -194,13 +194,13 @@
         }
     }
 
-    switch -exact $private_data_p {
+    switch -exact $guest_p {
         any {}
         t {
-            lappend wheres "exists (select 1 from acs_permissions where object_id = :package_id and grantee_id = dotlrn_users.user_id and privilege = 'read_private_data')"
+            lappend wheres "exists (select 1 from dotlrn_guest_status where dotlrn_guest_status.user_id = dotlrn_users.user_id and guest_p = 't')"
         }
         f {
-            lappend wheres "not exists (select 1 from acs_permissions where object_id = :package_id and grantee_id = dotlrn_users.user_id and privilege = 'read_private_data')"
+            lappend wheres "exists (select 1 from dotlrn_guest_status where dotlrn_guest_status.user_id = dotlrn_users.user_id and guest_p = 'f')"
         }
     }