Index: openacs-4/packages/dotlrn/www/admin/class.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v diff -u -r1.26 -r1.26.2.1 --- openacs-4/packages/dotlrn/www/admin/class.adp 9 Aug 2002 18:39:27 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/class.adp 17 Oct 2002 13:00:38 -0000 1.26.2.1 @@ -103,7 +103,7 @@ - [ Administer ] + Administer Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp 9 Aug 2002 18:39:27 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp 17 Oct 2002 13:00:38 -0000 1.3.2.1 @@ -20,11 +20,26 @@ @title@ +1 +

@title@

<%= [eval dotlrn::admin_navbar $context_bar] %>
+ + + + + + + + + + + + + Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 9 Aug 2002 18:39:27 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 17 Oct 2002 13:00:38 -0000 1.5.2.1 @@ -32,4 +32,7 @@ ad_permission_revoke $user_id [acs_magic_object "security_context_root"] "admin" } +util_memoize_flush_regexp $user_id ad_returnredirect $referer + + 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.26 -r1.26.2.1 --- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 9 Aug 2002 18:39:27 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 17 Oct 2002 13:00:38 -0000 1.26.2.1 @@ -25,7 +25,6 @@ {referer "[dotlrn::get_admin_url]/users"} } - set context_bar {{users Users} {New}} db_1row select_user_info { @@ -76,19 +75,58 @@ -widget hidden \ -value $referer + if {[form is_valid add_user]} { + form get_values add_user \ user_id id type can_browse_p read_private_data_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]." + + set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + db_transaction { dotlrn::user_add -id $id -type $type -can_browse\=$can_browse_p -user_id $user_id acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p } + + + if [catch {ns_sendmail $email $email_from $subject $message} errmsg] { + + ns_log Error "Error sending email from user-new-2.tcl" $errmsg + ad_return_error \ + "Error sending mail" \ + "There was an error sending email to $email." + } else { + set admin_subject "The following email was just sent from [ad_system_name]" + + set admin_message "The following email was just sent from [ad_system_name] + +Sent by: $email_from +Sent to: $email +Subject: $subject +Message: $message" + + + if [catch {ns_sendmail $email_from $email_from $admin_subject $admin_message} errmsg] { + + ns_log Error "Error sending email from user-new-2.tcl" $errmsg + ad_return_error \ + "Error sending mail" \ + "There was an error sending email to $email." + } + + } + ad_returnredirect $referer ad_script_abort } set context_bar {{users Users} New} ad_return_template + + + 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.8 -r1.8.2.1 --- openacs-4/packages/dotlrn/www/admin/user-oracle.xql 21 May 2002 07:46:03 -0000 1.8 +++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql 17 Oct 2002 13:00:38 -0000 1.8.2.1 @@ -6,6 +6,7 @@ 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 where dotlrn_users.user_id = :user_id @@ -31,8 +32,7 @@ select dotlrn_class_instances_full.*, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_class_instances_full, dotlrn_member_rels_approved where dotlrn_member_rels_approved.user_id = :user_id @@ -49,8 +49,7 @@ select dotlrn_clubs_full.*, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_clubs_full, dotlrn_member_rels_approved where dotlrn_member_rels_approved.user_id = :user_id @@ -66,8 +65,7 @@ dotlrn_community.url(dotlrn_communities.community_id) as url, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_communities, dotlrn_member_rels_approved where dotlrn_member_rels_approved.user_id = :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.1 -r1.1.2.1 --- openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 17 Oct 2002 13:00:38 -0000 1.1.2.1 @@ -6,6 +6,7 @@ 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 where dotlrn_users.user_id = :user_id @@ -31,8 +32,7 @@ select dotlrn_class_instances_full.*, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission__permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_class_instances_full, dotlrn_member_rels_approved where dotlrn_member_rels_approved.user_id = :user_id @@ -49,8 +49,7 @@ select dotlrn_clubs_full.*, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission__permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_clubs_full, dotlrn_member_rels_approved where dotlrn_member_rels_approved.user_id = :user_id @@ -66,8 +65,7 @@ dotlrn_community__url(dotlrn_communities.community_id) as url, dotlrn_member_rels_approved.rel_type, dotlrn_member_rels_approved.role, - '' as role_pretty_name, - acs_permission__permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p + '' as role_pretty_name from dotlrn_communities, dotlrn_member_rels_approved where dotlrn_member_rels_approved.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.16 -r1.16.2.1 --- openacs-4/packages/dotlrn/www/admin/user.adp 9 Aug 2002 18:39:27 -0000 1.16 +++ openacs-4/packages/dotlrn/www/admin/user.adp 17 Oct 2002 13:00:38 -0000 1.16.2.1 @@ -165,18 +165,34 @@

+ Add this user to dotLRN. + + +This user is currently in state @member_state@. To allow this user access to dotLRN you must
approve and add to dotLRN. +

+

Administrative Actions

Index: openacs-4/packages/dotlrn/www/admin/user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/user.tcl 9 Aug 2002 18:39:27 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 17 Oct 2002 13:00:38 -0000 1.10.2.1 @@ -44,6 +44,8 @@ set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id" set export_edit_vars "user_id=$user_id&return_url=$return_url" +set dotlrn_url [dotlrn::get_url] +set root_object_id [acs_magic_object security_context_root] if {![db_0or1row select_user_info {}]} { ad_return_complaint 1 "
  • We couldn't find user #$user_id; perhaps this person was deleted?
    • " ad_script_abort @@ -82,4 +84,6 @@ set context_bar [list [list users Users] "$first_names $last_name"] +set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url] + ad_return_template 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.12 -r1.12.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 2 Jun 2002 00:05:56 -0000 1.12 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 17 Oct 2002 12:59:53 -0000 1.12.2.1 @@ -36,11 +36,11 @@ acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types 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.1 -r1.1.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql 17 Oct 2002 12:59:53 -0000 1.1.2.1 @@ -36,11 +36,11 @@ acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl 9 Aug 2002 18:39:27 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl 17 Oct 2002 12:59:53 -0000 1.10.2.1 @@ -70,7 +70,7 @@ } } elseif {[string equal $type pending] == 1} { db_multirow users select_non_dotlrn_users {} { - set users:${i}(access_level) Limited + set users:${i}(access_level) N/A incr i } } else { 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.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 5 Jun 2002 05:09:01 -0000 1.13 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 17 Oct 2002 12:59:53 -0000 1.13.2.1 @@ -47,10 +47,11 @@ acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types 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.1 -r1.1.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql 17 Oct 2002 12:59:53 -0000 1.1.2.1 @@ -47,10 +47,11 @@ acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl 9 Aug 2002 18:39:27 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl 17 Oct 2002 12:59:53 -0000 1.11.2.1 @@ -62,7 +62,7 @@ append query "_other" } db_multirow users $query {} { - set users:${i}(access_level) Limited + set users:${i}(access_level) N/A incr i } } else { 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.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 2 Jun 2002 00:05:56 -0000 1.13 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 17 Oct 2002 12:59:53 -0000 1.13.2.1 @@ -24,18 +24,18 @@ persons.last_name, parties.email, 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, member_state from parties, users, persons, acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types 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.1 -r1.1.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql 17 Oct 2002 12:59:53 -0000 1.1.2.1 @@ -10,7 +10,7 @@ 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, - acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_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 order by dotlrn_users.last_name @@ -24,18 +24,19 @@ persons.last_name, parties.email, 'f' as read_private_data_p, - acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, + member_state from parties, users, persons, acs_rels, membership_rels where parties.party_id = users.user_id + and member_state not in ('banned','deleted','rejected') 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 from acs_rels a, dotlrn_user_types Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl 9 Aug 2002 18:39:27 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl 17 Oct 2002 12:59:53 -0000 1.9.2.1 @@ -45,7 +45,7 @@ } } elseif {[string equal $type pending] == 1} { db_multirow users select_non_dotlrn_users {} { - set users:${i}(access_level) Limited + set users:${i}(access_level) N/A incr i } } else { 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.17 -r1.17.2.1 --- openacs-4/packages/dotlrn/www/admin/users-chunk.adp 9 Aug 2002 18:39:27 -0000 1.17 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 17 Oct 2002 13:00:38 -0000 1.17.2.1 @@ -18,13 +18,34 @@ %> +<% + # The structure of this table is determined by the type of user we + # are displaying. It doesn't make much sense to display access + # level, guest status, and admin status for pending users. Instead we + # will offer links to common actions. + + # Note: There is some redundant logic inside the table and in + # other files that display access and guest status fields as N/A + # for pending users. Previous to the change, this page was + # displaying "Limited" and "Yes", respectively, which are wrong + # and confused our site administrator. + # The N/A logic is a failsafe in case these columns come back for + # some reason. aegrumet@mit.edu 2002-08-08. + +%> +
    + + + + + @@ -49,9 +70,23 @@ + + + + - + + Index: openacs-4/packages/dotlrn/www/admin/users-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-delete.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/dotlrn/www/admin/users-delete.tcl 9 Aug 2002 18:39:27 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/users-delete.tcl 17 Oct 2002 13:00:38 -0000 1.4.2.1 @@ -39,6 +39,12 @@ -widget hidden \ -value $users +element create confirm_delete referer \ + -label " " \ + -datatype text \ + -widget hidden \ + -value $referer + if {[form is_valid confirm_delete]} { form get_values confirm_delete \ users 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 -r1.13 -r1.13.2.1 --- openacs-4/packages/dotlrn/www/admin/users-oracle.xql 9 Jul 2002 12:39:33 -0000 1.13 +++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql 17 Oct 2002 13:00:38 -0000 1.13.2.1 @@ -7,8 +7,11 @@ select count(*) from (select acs_rels.object_id_two - from acs_rels + 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 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 -r1.2 -r1.2.2.1 --- openacs-4/packages/dotlrn/www/admin/users-postgresql.xql 11 Jul 2002 15:54:13 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/users-postgresql.xql 17 Oct 2002 13:00:38 -0000 1.2.2.1 @@ -7,8 +7,11 @@ select count(*) from (select acs_rels.object_id_two - from acs_rels + 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, 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.21 -r1.21.2.1 --- openacs-4/packages/dotlrn/www/admin/users-search.tcl 9 Aug 2002 18:39:27 -0000 1.21 +++ openacs-4/packages/dotlrn/www/admin/users-search.tcl 17 Oct 2002 13:00:38 -0000 1.21.2.1 @@ -248,6 +248,7 @@ if {[llength $wheres]} { append sql " where " append sql [join $wheres " $join_criteria "] + append sql "order by last_name, first_names" } set referer [ns_conn url] Index: openacs-4/packages/dotlrn/www/admin/users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v diff -u -r1.26 -r1.26.2.1 --- openacs-4/packages/dotlrn/www/admin/users.adp 9 Aug 2002 18:39:27 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/users.adp 17 Oct 2002 13:00:38 -0000 1.26.2.1 @@ -34,6 +34,13 @@

    +
    + Search dotLRN users for user: + + + + +
    Add a new dotLRN user: 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 -r1.15 -r1.15.2.1 --- openacs-4/packages/dotlrn/www/admin/users.tcl 9 Aug 2002 18:39:27 -0000 1.15 +++ openacs-4/packages/dotlrn/www/admin/users.tcl 17 Oct 2002 13:00:38 -0000 1.15.2.1 @@ -21,7 +21,7 @@ @creation-date 2002-01-30 @version $Id$ } -query { - {type "admin"} + {type "pending"} } -properties { context_bar:onevalue control_bar:onevalue @@ -46,7 +46,7 @@ set n_deactivated_users [db_string select_deactivated_users_count {}] lappend dotlrn_roles [list deactivated "Deactivated ($n_deactivated_users)" {}] -set control_bar [ad_dimensional [list [list type {User Type:} admin $dotlrn_roles]]] +set control_bar [ad_dimensional [list [list type {User Type:} $type $dotlrn_roles]]] if {[string equal $type "deactivated"] == 1} { set n_users $n_deactivated_users
    UserActionsAccess Guest? Site-wide Admin?
    + <% # We had to escape to Tcl to get the desired behavior. AG %> + approve and add to dotLRN | nuke + @users.access_level@noyes + + N/A + + + noyes + + yes @@ -62,6 +97,7 @@ yes