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 -N -r1.75.2.39 -r1.75.2.40
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 27 Feb 2023 18:39:14 -0000 1.75.2.39
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 30 May 2023 10:01:46 -0000 1.75.2.40
@@ -228,7 +228,7 @@
Class create ConnectionContext -superclass Context -parameter {
user_id
- requestor
+ requester
user
url
mobile
@@ -374,6 +374,16 @@
set ::ad_conn(file) ""
}
}
+
+ ConnectionContext instproc requestor {} {
+ #
+ # Helper method to ease migration to the name without the spelling
+ # error.
+ #
+ ad_log_deprecated method "... requestor" "... requester"
+ return [expr {[info exists :requester] ? ${:requester} : ${:requester}}]
+ }
+
ConnectionContext instproc lang {} {
return [string range [:locale] 0 1]
}
@@ -449,7 +459,7 @@
set pa [expr {[ns_conn isconnected] ? [ad_conn peeraddr] : "nowhere"}]
if {${:user_id} != 0} {
- set :requestor ${:user_id}
+ set :requester ${:user_id}
} else {
#
# For requests bypassing the ordinary connection setup
@@ -460,21 +470,21 @@
set cookie_list [ad_get_signed_cookie_with_expr "ad_session_id"]
set cookie_data [split [lindex $cookie_list 0] {,}]
set untrusted_user_id [lindex $cookie_data 1]
- set :requestor $untrusted_user_id
+ set :requester $untrusted_user_id
} on error {errorMsg } {
- set :requestor 0
+ set :requester 0
}
}
- # if user not authorized, use peer address as requestor key
- if {${:requestor} == 0} {
- set :requestor $pa
+ # if user not authorized, use peer address as requester key
+ if {${:requester} == 0} {
+ set :requester $pa
set :user "client from $pa"
} else {
- set user_url [acs_community_member_admin_url -user_id ${:requestor}]
- set :user "${:requestor}"
+ set user_url [acs_community_member_admin_url -user_id ${:requester}]
+ set :user "${:requester}"
}
- #:log "--i requestor = ${:requestor}"
+ #:log "--i requester = ${:requester}"
:process_query_parameter
}