Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.65.2.5 -r1.65.2.6
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 5 Jun 2016 12:50:51 -0000 1.65.2.5
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 14 Dec 2016 08:05:12 -0000 1.65.2.6
@@ -365,7 +365,8 @@
set requestor $pa
set user "client from $pa"
} else {
- set user "$requestor"
+ set user_url [acs_community_member_admin_url -user_id $requestor]
+ set user "$requestor"
}
#my log "--i requestor = $requestor"
Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl,v
diff -u -r1.2.2.4 -r1.2.2.5
--- openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 30 Nov 2016 08:16:17 -0000 1.2.2.4
+++ openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 14 Dec 2016 08:05:12 -0000 1.2.2.5
@@ -13,12 +13,13 @@
}
proc ::xo::userid_link {uid} {
- if {[string first . $uid] > -1} {
- set userinfo 0
- } else {
- set userinfo "$uid"
- }
- return $userinfo
+ if {![string is integer -strict $uid]} {
+ set userinfo 0
+ } else {
+ set user_url [acs_community_member_admin_url -user_id $uid]
+ set userinfo "$uid"
+ }
+ return $userinfo
}
proc ::xo::regsub_eval {re string cmd {prefix ""}} {
set map { \" \\\" \[ \\[ \] \\] \$ \\$ \\ \\\\}
Index: openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 30 Nov 2016 08:16:17 -0000 1.3.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 14 Dec 2016 08:05:12 -0000 1.3.2.3
@@ -29,14 +29,14 @@
multirow create url_statistics type user user_url time IPadress URL
foreach l [lsort -index 2 $data] {
- lassign $l type user time IPadress URL
- if {[string match "*.*" $user]} {
+ lassign $l type uid time IPadress URL
+ if {![string is integer -strict $uid]} {
set user "Anonymous"
set user_url ""
} else {
- acs_user::get -user_id $user -array userinfo
- set user_url /acs-admin/users/one?user_id=$user
+ acs_user::get -user_id $uid -array userinfo
set user "$userinfo(first_names) $userinfo(last_name)"
+ set user_url [acs_community_member_admin_url -user_id $uid]
}
set time [clock format $time -format "%Y-%m-%d %H:%M:%S"]
multirow append url_statistics $type $user $user_url $time $IPadress $URL