Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.33.2.4 -r1.33.2.5 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 11 Feb 2004 10:49:27 -0000 1.33.2.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 21 Feb 2004 02:36:50 -0000 1.33.2.5 @@ -449,6 +449,7 @@ Pretty Name Pretty Plural Preview + The privacy policy must be either "yes" or "no". Public Web Log purple Recipient's Email Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql,v diff -u -r1.19 -r1.19.2.1 --- openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql 4 Dec 2002 09:51:03 -0000 1.19 +++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql 21 Feb 2004 02:36:51 -0000 1.19.2.1 @@ -38,3 +38,4 @@ @@ security-create.sql @@ user-extension-create.sql @@ custom-permissions.sql +@@ privacy-init.sql \ No newline at end of file Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql 4 Dec 2002 09:51:03 -0000 1.10 +++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql 21 Feb 2004 02:36:51 -0000 1.10.2.1 @@ -37,3 +37,4 @@ \i security-create.sql \i user-extension-create.sql \i custom-permissions.sql +\i privacy-init.sql Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.183.2.2 -r1.183.2.3 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 16 Feb 2004 15:50:09 -0000 1.183.2.2 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 Feb 2004 02:36:51 -0000 1.183.2.3 @@ -311,7 +311,10 @@ # this community should be able to read this instance (and # it's children) permission::set_not_inherit -object_id $community_id - + + # Grant read_private_data permission to "non guest" users. + dotlrn_privacy::grant_read_private_data_to_non_guests -object_id $community_id + #this block sets permissions for subcommunities while {1} { if {![empty_string_p $parent_community_id]} { @@ -1743,6 +1746,9 @@ db_dml copy_customizations_if_any {} } + # Grant read_private_data permission to "non guest" users. + dotlrn_privacy::grant_read_private_data_to_non_guests -object_id $clone_id + # recursively clone the subcommunities set subcomm_list [get_subcomm_info_list -community_id $community_id] Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v diff -u -r1.54 -r1.54.2.1 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 23 Sep 2003 21:43:46 -0000 1.54 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 21 Feb 2004 02:36:51 -0000 1.54.2.1 @@ -252,26 +252,27 @@ ad_proc -public user_can_read_private_data_p { {-user_id ""} + {-object_id:required} } { Check if a user can read sensitive data in dotLRN } { - if { [parameter::get -parameter protect_private_data_p -default 1] } { - return [ad_permission_p \ - -user_id $user_id \ - [dotlrn::get_package_id] \ - read_private_data - ] - } else { - return 1 - } + if { [parameter::get -parameter protect_private_data_p -default 1] } { + return [acs_privacy::user_can_read_private_data_p \ + -user_id $user_id \ + -object_id $object_id + ] + } else { + return 1 + } } ad_proc -public require_user_read_private_data { {-user_id ""} + {-object_id:required} } { Require that a user be able to read sensitive data } { - if {![user_can_read_private_data_p -user_id $user_id]} { + if {![user_can_read_private_data_p -user_id $user_id -object_id $object_id]} { do_abort } } Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/index-not-a-user.tcl 13 Nov 2003 11:08:52 -0000 1.15 +++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl 21 Feb 2004 02:36:51 -0000 1.15.2.1 @@ -82,9 +82,8 @@ -can_browse=$can_browse_p \ -user_id $user_id - acs_privacy::set_user_read_private_data \ + dotlrn_privacy::set_user_is_non_guest \ -user_id $user_id \ - -object_id [dotlrn::get_package_id] \ -value $read_private_data_p } Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table.adp 24 Oct 2003 12:59:26 -0000 1.14 +++ openacs-4/packages/dotlrn/www/members-chunk-table.adp 21 Feb 2004 02:36:51 -0000 1.14.2.1 @@ -61,20 +61,8 @@ <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.first_names@] %> <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.last_name@]%> - @current_members.email@ - - - - - @current_members.email@ - - -   - - - <%=[template::util::nvl [dotlrn_community::get_role_pretty_name -community_id @community_id@ -rel_type @current_members.rel_type@] "Student"]%> @@ -130,9 +118,7 @@
  • <%= [acs_community_member_link -user_id $pending_users(user_id) -label "$pending_users(first_names) $pending_users(last_name)"] %> - (@pending_users.email@) -   @pending_users.role@   Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v diff -u -r1.23 -r1.23.2.1 --- openacs-4/packages/dotlrn/www/members-chunk-table.tcl 9 Oct 2003 12:46:10 -0000 1.23 +++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl 21 Feb 2004 02:36:51 -0000 1.23.2.1 @@ -35,22 +35,20 @@ # use my_user_id here so we don't confuse with user_id from the query set my_user_id [ad_conn user_id] -dotlrn::require_user_read_private_data -user_id $my_user_id - set community_id [dotlrn_community::get_community_id] set referer [ns_conn url] +dotlrn::require_user_read_private_data -user_id $my_user_id -object_id $community_id + set site_wide_admin_p [permission::permission_p \ -object_id [acs_magic_object security_context_root] \ -privilege admin \ ] if {!$site_wide_admin_p} { set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id] - set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $my_user_id] } else { set admin_p 1 - set read_private_data_p 1 } if {![exists_and_not_null referer]} { Index: openacs-4/packages/dotlrn/www/members-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/dotlrn/www/members-chunk.tcl 9 Oct 2003 12:46:10 -0000 1.17 +++ openacs-4/packages/dotlrn/www/members-chunk.tcl 21 Feb 2004 02:36:51 -0000 1.17.2.1 @@ -35,7 +35,7 @@ set site_wide_admin_p [ad_permission_p -user_id $user_id [acs_magic_object "security_context_root"] "admin"] if {!$site_wide_admin_p} { set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] - set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id] + set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id -object_id $community_id] } else { set admin_p 1 set read_private_data_p 1 Index: openacs-4/packages/dotlrn/www/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/dotlrn/www/user-add-2.tcl 17 Dec 2003 09:48:09 -0000 1.8.2.1 +++ openacs-4/packages/dotlrn/www/user-add-2.tcl 21 Feb 2004 02:36:51 -0000 1.8.2.2 @@ -54,7 +54,7 @@ if {!$dotlrn_user_p} { db_transaction { # can this user read private data? - acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p + dotlrn_privacy::set_user_is_non_guest -user_id $user_id -value $read_private_data_p if {!${dotlrn_interactive_p}} { # make the user a dotLRN user Index: openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl 29 May 2003 18:05:01 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl 21 Feb 2004 02:36:51 -0000 1.10.2.1 @@ -31,7 +31,7 @@ # if the user isn't already a dotLRN user make him so if {!${is_dotlrn_user}} { dotlrn::user_add -user_id $user_id -type professor -can_browse - acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value t + dotlrn_privacy::set_user_is_non_guest -user_id $user_id -value t } # Add the relation Index: openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql,v diff -u -r1.8 -r1.8.6.1 --- openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql 2 Jun 2002 00:05:56 -0000 1.8 +++ openacs-4/packages/dotlrn/www/admin/user-edit-oracle.xql 21 Feb 2004 02:36:51 -0000 1.8.6.1 @@ -10,7 +10,7 @@ dotlrn_users.last_name, dotlrn_users.email, dotlrn_users.type, - acs_permission.permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p + dotlrn_guest_p(:user_id) as guest_p from dotlrn_users where dotlrn_users.user_id = :user_id Index: openacs-4/packages/dotlrn/www/admin/user-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-postgresql.xql,v diff -u -r1.1 -r1.1.6.1 --- openacs-4/packages/dotlrn/www/admin/user-edit-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/user-edit-postgresql.xql 21 Feb 2004 02:36:51 -0000 1.1.6.1 @@ -10,7 +10,7 @@ dotlrn_users.last_name, dotlrn_users.email, dotlrn_users.type, - acs_permission__permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p + dotlrn_guest_p(:user_id) as guest_p from dotlrn_users where dotlrn_users.user_id = :user_id Index: openacs-4/packages/dotlrn/www/admin/user-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.tcl,v diff -u -r1.20 -r1.20.2.1 --- openacs-4/packages/dotlrn/www/admin/user-edit.tcl 23 Oct 2002 12:38:40 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/user-edit.tcl 21 Feb 2004 02:36:51 -0000 1.20.2.1 @@ -1,4 +1,4 @@ -# + # Copyright (C) 2001, 2002 MIT # # This file is part of dotLRN. @@ -62,12 +62,12 @@ -options [list [list [_ dotlrn.Full] 1] [list [_ dotlrn.Limited] 0]] \ -value $can_browse_p -element create edit_user read_private_data_p \ +element create edit_user guest_p \ -label "[_ dotlrn.Guest_1]" \ -datatype text \ -widget select \ - -options [list [list [_ dotlrn.No] t] [list [_ dotlrn.Yes] f]] \ - -value $read_private_data_p + -options [list [list [_ dotlrn.No] f] [list [_ dotlrn.Yes] t]] \ + -value $guest_p element create edit_user return_url \ -label "[_ dotlrn.Return_URL]" \ @@ -77,7 +77,7 @@ if {[form is_valid edit_user]} { form get_values edit_user \ - user_id id type can_browse_p read_private_data_p return_url + user_id id type can_browse_p guest_p return_url db_transaction { # remove the user @@ -91,10 +91,9 @@ -user_id $user_id # Update permissions - acs_privacy::set_user_read_private_data \ + dotlrn_privacy::set_user_guest_p \ -user_id $user_id \ - -object_id [dotlrn::get_package_id] \ - -value $read_private_data_p + -value $guest_p } # redirect Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v diff -u -r1.30 -r1.30.2.1 --- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 28 Oct 2003 17:28:50 -0000 1.30 +++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 21 Feb 2004 02:36:51 -0000 1.30.2.1 @@ -63,11 +63,11 @@ -widget select \ -options [list [list "[_ dotlrn.Full_Access]" 1] [list "[_ dotlrn.Limited_Access]" 0]] -element create add_user read_private_data_p \ +element create add_user guest_p \ -label "[_ dotlrn.Guest_1]" \ -datatype text \ -widget select \ - -options [list [list [_ dotlrn.No] t] [list [_ dotlrn.Yes] f]] + -options [list [list [_ dotlrn.No] f] [list [_ dotlrn.Yes] t]] element create add_user referer \ -label [_ dotlrn.Referer] \ @@ -79,7 +79,7 @@ if {[form is_valid add_user]} { form get_values add_user \ - user_id id type can_browse_p read_private_data_p referer + user_id id type can_browse_p guest_p referer set subject "Your [ad_system_name] membership has been approved" set message "Your [ad_system_name] membership has been approved. Please return to [ad_url] to log into [ad_system_name]." @@ -94,10 +94,9 @@ -can_browse\=$can_browse_p \ -user_id $user_id - acs_privacy::set_user_read_private_data \ + dotlrn_privacy::set_user_guest_p \ -user_id $user_id \ - -object_id [dotlrn::get_package_id] \ - -value $read_private_data_p + -value $guest_p } Index: openacs-4/packages/dotlrn/www/admin/user-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-oracle.xql,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/user-oracle.xql 3 Nov 2003 10:46:45 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql 21 Feb 2004 02:36:51 -0000 1.10.2.1 @@ -5,11 +5,11 @@ - select dotlrn_users.*, - acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p, - acs_permission.permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p - from dotlrn_users + select dotlrn_users.*, guest_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users, dotlrn_guest_status where dotlrn_users.user_id = :user_id + and dotlrn_guest_status.user_id(+) = dotlrn_users.user_id Index: openacs-4/packages/dotlrn/www/admin/user-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 3 Nov 2003 10:46:45 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 21 Feb 2004 02:36:51 -0000 1.3.2.1 @@ -5,10 +5,10 @@ - select dotlrn_users.*, + select dotlrn_users.*, guest_p, acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p, - acs_permission__permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p - from dotlrn_users + from dotlrn_users left outer join dotlrn_guest_status + on guest_status.user_id = dotlrn_users.user_id where dotlrn_users.user_id = :user_id Index: openacs-4/packages/dotlrn/www/admin/user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v diff -u -r1.25.2.1 -r1.25.2.2 --- openacs-4/packages/dotlrn/www/admin/user.adp 25 Nov 2003 10:40:03 -0000 1.25.2.1 +++ openacs-4/packages/dotlrn/www/admin/user.adp 21 Feb 2004 02:36:51 -0000 1.25.2.2 @@ -93,7 +93,7 @@
  • #dotlrn.Guest# - #dotlrn.No##dotlrn.Yes# + #dotlrn.Yes##dotlrn.No#
  • Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 23 Sep 2003 17:13:36 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 21 Feb 2004 02:36:51 -0000 1.11.2.1 @@ -96,14 +96,8 @@ } } - if {$row(guest) == "f"} { - set inverse_row_guest "t" - } else { - set inverse_row_guest "f" - } - # Set the privacy - acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $inverse_row_guest + dotlrn_privacy::set_user_guest_p -user_id $user_id -value $row(guest) doc_body_append [_ dotlrn.user_email_created [list user_email $row(email)]] set msg_subst_list [list system_name [ad_system_name] \ Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 29 May 2003 18:05:01 -0000 1.14 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 21 Feb 2004 02:36:51 -0000 1.14.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -28,7 +28,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -62,7 +62,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql 29 May 2003 18:05:01 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql 21 Feb 2004 02:36:51 -0000 1.3.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -28,7 +28,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -62,7 +62,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 29 May 2003 18:05:01 -0000 1.15 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 21 Feb 2004 02:36:51 -0000 1.15.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -24,7 +24,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -39,7 +39,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -69,7 +69,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -97,7 +97,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -121,7 +121,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql 29 May 2003 18:05:01 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql 21 Feb 2004 02:36:51 -0000 1.3.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -24,7 +24,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -39,7 +39,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -69,7 +69,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -97,7 +97,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, @@ -121,7 +121,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, 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.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 29 May 2003 18:05:01 -0000 1.15 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 21 Feb 2004 02:36:51 -0000 1.15.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -23,7 +23,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, member_state from parties, users, @@ -52,7 +52,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 29 May 2003 18:05:01 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 21 Feb 2004 02:36:51 -0000 1.3.2.1 @@ -9,7 +9,7 @@ dotlrn_users.first_names, dotlrn_users.last_name, dotlrn_users.email, - acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + dotlrn_guest_p(dotlrn_users.user_id) as guest_p, acs_permission__permission_p(:root_object_id,dotlrn_users.user_id, 'admin') as site_wide_admin_p from dotlrn_users where dotlrn_users.type = :type @@ -23,7 +23,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, member_state from parties, @@ -53,7 +53,7 @@ persons.first_names, persons.last_name, parties.email, - 'f' as read_private_data_p, + 'f' as guest_p, acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p from parties, users, Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v diff -u -r1.22 -r1.22.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk.adp 22 Oct 2003 16:45:41 -0000 1.22 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 21 Feb 2004 02:36:51 -0000 1.22.2.1 @@ -83,7 +83,7 @@ #dotlrn.NA# - #dotlrn.No##dotlrn.Yes# + #dotlrn.Yes##dotlrn.No# Index: openacs-4/packages/dotlrn/www/admin/users-search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.adp,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn/www/admin/users-search.adp 9 Oct 2003 12:36:14 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/users-search.adp 21 Feb 2004 02:36:51 -0000 1.9.2.1 @@ -50,7 +50,7 @@ #dotlrn.Guest# - + 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')" } } Index: openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml 6 Nov 2003 09:11:22 -0000 1.15 +++ openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml 21 Feb 2004 02:36:51 -0000 1.15.2.1 @@ -18,6 +18,7 @@ Create a new Limited Access user Create a new Limited Access Guest user Customize Portal Layout + Guest users can view group membership information? No %subcomm_pretty_plural% Only use this to create an account for cross-registered students who do not have accounts from a previous class. Only use this to create accounts for non-affiliated users who do not already have an account. Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v diff -u -r1.29 -r1.29.2.1 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 30 Oct 2003 11:38:06 -0000 1.29 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 21 Feb 2004 02:36:51 -0000 1.29.2.1 @@ -29,6 +29,10 @@
  • #dotlrn-portlet.Archive_this_group#
    • +
  • + #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# - + #acs-kernel.common_yes# | #acs-kernel.common_no#Yes | No +

  • #dotlrn-portlet.Manage_Membership# - #dotlrn-portlet.lt_AddRemove_pretty_name#
    • Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl 4 Dec 2002 09:50:08 -0000 1.14 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl 21 Feb 2004 02:36:51 -0000 1.14.2.1 @@ -51,6 +51,9 @@ # get the community info db_1row select_community_info {} +# get Guest policy info +set guests_can_view_private_data_p [dotlrn_privacy::guests_can_view_private_data_p -object_id $community_id] + # get the subcomm info set rows [dotlrn_community::get_subcomm_info_list -community_id $community_id] template::util::list_of_ns_sets_to_multirow -rows $rows -var_name subgroups Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 26 Nov 2003 16:22:00 -0000 1.10.2.1 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 21 Feb 2004 02:36:51 -0000 1.10.2.2 @@ -31,7 +31,7 @@ set community_id $config(community_id) set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] -set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id] +set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id -object_id $community_id] set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] # Get all users for this community, including role Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 29 May 2003 18:05:27 -0000 1.10 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 21 Feb 2004 02:36:51 -0000 1.10.2.1 @@ -34,7 +34,7 @@ if { ![string equal $community_id 0] } { set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] - set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id] + set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id -object_id $community_id] # get all the users in a list of ns_sets set all_users_list [dotlrn_community::list_users $community_id] Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/forums-portlet/www/forums-portlet.tcl 29 May 2003 18:05:39 -0000 1.10 +++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl 21 Feb 2004 02:36:51 -0000 1.10.2.1 @@ -19,7 +19,7 @@ set shaded_p $config(shaded_p) set list_of_package_ids $config(package_id) set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] -set can_read_private_data_p [dotlrn::user_can_read_private_data_p] +set can_read_private_data_p [acs_privacy::user_can_read_private_data_p -object_id [ad_conn package_id]] set query select_forums