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.20 -r1.21
--- openacs-4/packages/dotlrn/www/admin/user.tcl	20 Jul 2006 04:15:09 -0000	1.20
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	8 Aug 2006 21:26:28 -0000	1.21
@@ -44,8 +44,6 @@
 #Pages in this directory are only runnable by dotlrn-wide admins.
 dotlrn::require_admin 
 
-set oacs_site_wide_admin_p [acs_user::site_wide_admin_p]
-
 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"
 
@@ -56,7 +54,7 @@
     ad_script_abort
 }
 if {[empty_string_p $screen_name]} {
-    set screen_name "<[_ dotlrn.none_set_up]>"
+    set screen_name "([_ dotlrn.none_set_up])"
 }
 set registration_date [lc_time_fmt $registration_date "%q"]
 if {![empty_string_p $last_visit]} {
@@ -75,7 +73,7 @@
     set portrait_p 1
 }
 
-set change_state_links "\[<small>[join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id $return_url] " | "]</small>\]"
+set change_state_links "\[ <small>[join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id $return_url] " | "]</small> \]"
 
 db_multirow member_classes select_member_classes {} {
     set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $class_instance_id -rel_type $rel_type]
@@ -87,14 +85,14 @@
     set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
 }
 
-set site_wide_admin_p [permission::permission_p \
-        -party_id $user_id \
-        -object_id [acs_magic_object "security_context_root"] \
-        -privilege admin \
-        ]
-
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 set dotlrn_admin_p [dotlrn::admin_p]
 
+set administrative_action_p 0
+if { ($oacs_site_wide_admin_p && $site_wide_admin_p) || (!$site_wide_admin_p && ($oacs_site_wide_admin_p || $dotlrn_admin_p))} {
+	set administrative_action_p 1
+}
+
 set context_bar [list [list users [_ dotlrn.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]