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.6.4.7 -r1.33.2.6.4.8 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 9 Aug 2004 11:22:31 -0000 1.33.2.6.4.7 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 12 Aug 2004 07:34:27 -0000 1.33.2.6.4.8 @@ -295,6 +295,7 @@ Key (a short name, no spaces) Last Visit Over (in days) Last Visit Within (in days) + User has not visited yet Make this user a site wide admin. Manage this user's portrait No, I don't want to archive this group. @@ -311,6 +312,7 @@ make an attempt. If we succeed, you'll be redirected to where you were. If there is an error and we are unable to complete the removal, we'll return an error message. + Are you sure you want to remove these users completely? Note that we only attempt to remove these users and may encounter errors for some of the users. Please follow the following link to reset your password: %change_password_url% @@ -364,7 +366,7 @@ Well, we tried to nuke the user, but there was an error. The most likely case is that a reference to this user (user_id=%user_id%) exists somewhere in the database schema. It's time to call your -programmers! +programmers! The actual error returned was: You are about to delete %num_users% users. You are adding <strong>%first_names% %last_name% (%email%)</strong> to %community_name%: You are not allowed to perform that action. 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.2.1.4.4 -r1.54.2.1.4.5 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 23 Jul 2004 16:57:08 -0000 1.54.2.1.4.4 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 12 Aug 2004 07:34:28 -0000 1.54.2.1.4.5 @@ -191,11 +191,26 @@ } { Remove the user from ACS as well } { - if {[user_p -user_id $user_id]} { - user_remove -user_id $user_id + # DEDS: for now let us not remove users with historical data. + # we assume this by looking at last_visit which is lame but + # the safest for now. the consortium might want to decide on + # whether we also want nuking of users with data present + set last_visit [acs_user::get_element -user_id $user_id -element last_visit] + if {[empty_string_p $last_visit]} { + if {[user_p -user_id $user_id]} { + user_remove -user_id $user_id + } + + # cycle through the applets and invoke their RemoveUser procs + foreach applet_key [dotlrn_applet::list_applets] { + dotlrn_community::applet_call \ + $applet_key \ + RemoveUser \ + [list $user_id] + } + + acs_user::delete -user_id $user_id -permanent } - - acs_user::delete -user_id $user_id } ad_proc -public remove_users_completely { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/test/dotlrn-security-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp,v diff -u -r1.2 -r1.2.6.1 --- openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp 12 Aug 2004 07:34:29 -0000 1.2.6.1 @@ -7,7 +7,11 @@

#dotlrn.lt_Well_we_tried_to_nuke# -

- +

+
+@error_msg@
+
+
+

#dotlrn.lt_Return_to_where_you_w# Index: openacs-4/packages/dotlrn/www/admin/user-nuke.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke.tcl,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/dotlrn/www/admin/user-nuke.tcl 6 Oct 2003 13:21:53 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/user-nuke.tcl 12 Aug 2004 07:34:29 -0000 1.3.6.1 @@ -38,7 +38,8 @@ if [form is_valid confirm_delete] { form get_values confirm_delete user_id confirmed_p if [string equal $confirmed_p t] { - if [catch { db_exec_plsql nuke_user {} } errMsg ] { + if [catch { dotlrn::remove_user_completely -user_id $user_id } errMsg ] { + set error_msg $errMsg ad_return_template user-nuke-error } else { # Nuke was successful. 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.2.4.4 -r1.25.2.2.4.5 --- openacs-4/packages/dotlrn/www/admin/user.adp 2 Aug 2004 10:47:02 -0000 1.25.2.2.4.4 +++ openacs-4/packages/dotlrn/www/admin/user.adp 12 Aug 2004 07:34:29 -0000 1.25.2.2.4.5 @@ -66,6 +66,11 @@ @last_visit@ + +

  • + #dotlrn.lt_Last_Visit_None_#: @remove_user_url;noquote@ +
    • +
  • 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.16.6.2 -r1.16.6.3 --- openacs-4/packages/dotlrn/www/admin/user.tcl 19 Jul 2004 18:39:39 -0000 1.16.6.2 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 12 Aug 2004 07:34:29 -0000 1.16.6.3 @@ -96,6 +96,8 @@ set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url" +set remove_user_url "\[Nuke\]" + # Used in some en_US messages in the adp file set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name] set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name] Index: openacs-4/packages/dotlrn/www/admin/users-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-delete.adp,v diff -u -r1.6 -r1.6.6.1 --- openacs-4/packages/dotlrn/www/admin/users-delete.adp 23 Oct 2002 12:38:40 -0000 1.6 +++ openacs-4/packages/dotlrn/www/admin/users-delete.adp 12 Aug 2004 07:34:29 -0000 1.6.6.1 @@ -23,7 +23,7 @@ @context_bar@

    - #dotlrn.lt_Are_you_sure_you_want# + #dotlrn.lt_Are_you_sure_you_want_nuke_users#