Index: openacs-4/packages/acs-authentication/tcl/password-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/password-procs.tcl,v
diff -u -r1.26 -r1.26.2.1
--- openacs-4/packages/acs-authentication/tcl/password-procs.tcl 22 Dec 2018 09:38:53 -0000 1.26
+++ openacs-4/packages/acs-authentication/tcl/password-procs.tcl 21 Jul 2020 14:05:18 -0000 1.26.2.1
@@ -120,7 +120,7 @@
# Refresh the current user's cookies, so he doesn't get logged out,
# if this user was logged in before changing password
- if { [ad_conn isconnected] && $user_id == $connection_user_id } {
+ if { [ns_conn isconnected] && $user_id == $connection_user_id } {
auth::issue_login -account_status [ad_conn account_status] -user_id $user_id
}
}
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.68.2.8 -r1.68.2.9
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 17 Jun 2020 09:55:18 -0000 1.68.2.8
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 21 Jul 2020 14:02:09 -0000 1.68.2.9
@@ -852,7 +852,7 @@
if { $locale eq "" } {
# No locale provided
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
# We are in an HTTP connection (request) so use that locale
set locale [ad_conn locale]
} else {
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.54.2.7 -r1.54.2.8
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 18 Jun 2020 06:56:26 -0000 1.54.2.7
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 21 Jul 2020 14:02:09 -0000 1.54.2.8
@@ -679,7 +679,7 @@
if {[info exists ::acs_translator_mode_p]} {
return $::acs_translator_mode_p
}
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
# There is an HTTP connection - return the client property
set ::acs_translator_mode_p [ad_get_client_property -default 0 acs-lang translator_mode_p]
if {$::acs_translator_mode_p eq ""} {
Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -r1.51.2.7 -r1.51.2.8
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl 18 May 2020 21:20:20 -0000 1.51.2.7
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl 21 Jul 2020 14:02:09 -0000 1.51.2.8
@@ -80,7 +80,7 @@
return [site_wide_locale]
}
- if { $package_id eq "" && [ad_conn isconnected] } {
+ if { $package_id eq "" && [ns_conn isconnected] } {
set package_id [ad_conn package_id]
}
@@ -733,7 +733,7 @@
}
set timezone {}
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
set timezone [lang::user::timezone]
}
Index: openacs-4/packages/acs-lang/tcl/localization-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.tcl,v
diff -u -r1.29.2.13 -r1.29.2.14
--- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 3 Jul 2020 07:53:44 -0000 1.29.2.13
+++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 21 Jul 2020 14:02:09 -0000 1.29.2.14
@@ -499,7 +499,7 @@
@param time_value Timestamp from the database in the ISO datetime format.
@return Timestamp in conn's local time, also in ISO datetime format.
} {
- if { ![ad_conn isconnected] } {
+ if { ![ns_conn isconnected] } {
return $time_value
}
@@ -522,7 +522,7 @@
@param time_value Timestamp from conn input in the ISO datetime format.
@return Timestamp in the database's timezone, also in ISO datetime format.
} {
- if { ![ad_conn isconnected] } {
+ if { ![ns_conn isconnected] } {
return $time_value
}
Index: openacs-4/packages/acs-subsite/tcl/application-group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/application-group-procs.tcl,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/acs-subsite/tcl/application-group-procs.tcl 10 Dec 2018 18:26:57 -0000 1.23
+++ openacs-4/packages/acs-subsite/tcl/application-group-procs.tcl 21 Jul 2020 13:58:55 -0000 1.23.2.1
@@ -25,7 +25,7 @@
} {
- if {$package_id eq "" && [ad_conn isconnected]} {
+ if {$package_id eq "" && [ns_conn isconnected]} {
set package_id [ad_conn package_id]
}
@@ -79,7 +79,7 @@
[ad_conn package_id]).
} {
- if {$package_id eq "" && [ad_conn isconnected]} {
+ if {$package_id eq "" && [ns_conn isconnected]} {
set package_id [ad_conn package_id]
}
@@ -115,7 +115,7 @@
} {
- if {$package_id eq "" && [ad_conn isconnected]} {
+ if {$package_id eq "" && [ns_conn isconnected]} {
set package_id [ad_conn package_id]
}
@@ -150,7 +150,7 @@
empty string if the application group doesn't exist.
} {
- if { [ad_conn isconnected] && $package_id eq "" } {
+ if { [ns_conn isconnected] && $package_id eq "" } {
set package_id [ad_conn package_id]
}
@@ -201,7 +201,7 @@
Returns the group_id of the new application group.
} {
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
# Since we have a connection, default user_id / peeraddr
# if they're not specified
if { $creation_user eq "" } {
Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -r1.40.2.4 -r1.40.2.5
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl 3 Jul 2020 07:43:20 -0000 1.40.2.4
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl 21 Jul 2020 13:58:55 -0000 1.40.2.5
@@ -521,7 +521,7 @@
@creation-date 12/29/2000
} {
- set author [expr {[ad_conn isconnected] ?
+ set author [expr {[ns_conn isconnected] ?
[acs_user::get_element -element name] : "Unknown"}]
set creation_date [db_string current_timestamp {
select current_timestamp from dual}]
@@ -721,7 +721,7 @@
set package_name $acs_type(package_name)
}
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
if { $creation_user eq "" } {
set creation_user [ad_conn user_id]
}
@@ -818,7 +818,7 @@
set object_id [db_exec_plsql create_object {}]
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
subsite::callback -object_type $object_type "insert" $object_id
}
Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 13 Dec 2019 14:17:42 -0000 1.7.2.2
+++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 21 Jul 2020 13:58:55 -0000 1.7.2.3
@@ -42,7 +42,7 @@
@return The <code>segment_id</code> of the new segment
} {
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
if { $creation_user eq "" } {
set creation_user [ad_conn user_id]
}
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.68.2.12 -r1.68.2.13
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 3 Jul 2020 07:43:20 -0000 1.68.2.12
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 21 Jul 2020 13:58:55 -0000 1.68.2.13
@@ -1222,7 +1222,7 @@
@param node_id the subsite's node_id (defaults to nearest subsite node).
@param absolute_p whether to include the host in the returned url.
} {
- if {[ad_conn isconnected]} {
+ if {[ns_conn isconnected]} {
if {$node_id eq ""} {
set node_id [ad_conn subsite_node_id]
}
Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 14 Feb 2019 16:15:00 -0000 1.11.2.1
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 21 Jul 2020 14:02:08 -0000 1.11.2.2
@@ -50,7 +50,7 @@
# bumped back to needs_approval right after an administrator has approved them,
# even if the user doesn't log in the meantime.
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
set user_id [ad_conn user_id]
} else {
set user_id ""
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.126.2.33 -r1.126.2.34
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 3 Jul 2020 07:27:29 -0000 1.126.2.33
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 21 Jul 2020 14:02:09 -0000 1.126.2.34
@@ -1010,7 +1010,7 @@
#
# We are on normal subsite
#
- if { [ad_conn isconnected] } {
+ if { [ns_conn isconnected] } {
set url [subsite::get_element -element url]
#
# Check to see that the user (most likely "The Public"
@@ -1078,7 +1078,7 @@
# because that will frequently interfere with the normal login
# procedure.
#
- if { [ad_conn isconnected] && $return_p && ![string match "register/*" [ad_conn extra_url]] } {
+ if { [ns_conn isconnected] && $return_p && ![string match "register/*" [ad_conn extra_url]] } {
#
# In a few cases, we do not need to add a fully qualified
# return url. The secure cases have to be still tested.
Index: openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 19 Sep 2018 00:55:36 -0000 1.14
+++ openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 21 Jul 2020 14:02:09 -0000 1.14.2.1
@@ -43,7 +43,7 @@
@return empty string if not found.
} {
if {$package_id eq ""} {
- if {[ad_conn isconnected]} {
+ if {[ns_conn isconnected]} {
set package_id [ad_conn package_id]
} else {
error "Not in a connection and no package_id provided"
Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v
diff -u -r1.12.2.4 -r1.12.2.5
--- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 11 Dec 2019 17:04:00 -0000 1.12.2.4
+++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 21 Jul 2020 14:03:49 -0000 1.12.2.5
@@ -145,7 +145,7 @@
# search indexer. In that case we set the locale to the
# system-wide default locale, since locale is needed for some part
# of the message formatting.
- if { ![ad_conn isconnected] } {
+ if { ![ns_conn isconnected] } {
ad_conn -set locale [lang::system::site_wide_locale]
}
Index: openacs-4/packages/forums/tcl/forums-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-sc-procs.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/forums/tcl/forums-sc-procs.tcl 7 May 2020 08:34:04 -0000 1.17.2.1
+++ openacs-4/packages/forums/tcl/forums-sc-procs.tcl 21 Jul 2020 14:03:49 -0000 1.17.2.2
@@ -34,7 +34,7 @@
# search indexer. In that case we set the locale to the
# system-wide default locale, since locale is needed for some part
# of the message formatting.
- if { ![ad_conn isconnected] } {
+ if { ![ns_conn isconnected] } {
ad_conn -set locale [lang::system::site_wide_locale]
}
forum::message::get -message_id $message_id -array message
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.59.2.21 -r1.59.2.22
--- openacs-4/packages/forums/tcl/messages-procs.tcl 29 May 2020 10:40:36 -0000 1.59.2.21
+++ openacs-4/packages/forums/tcl/messages-procs.tcl 21 Jul 2020 14:03:49 -0000 1.59.2.22
@@ -337,7 +337,7 @@
# make sure array is empty
array unset row
- set attachments_sql [expr {[ad_conn isconnected] && [forum::attachments_enabled_p] ? {
+ set attachments_sql [expr {[ns_conn isconnected] && [forum::attachments_enabled_p] ? {
(select count(*) from attachments
where object_id = m.message_id) as n_attachments,
} : ""}]
Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/notifications/tcl/notification-procs.tcl 3 Jul 2020 08:03:18 -0000 1.23.2.2
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl 21 Jul 2020 14:03:49 -0000 1.23.2.3
@@ -281,7 +281,7 @@
}
}
- if { $notif_user eq "" && [ad_conn isconnected] } {
+ if { $notif_user eq "" && [ns_conn isconnected] } {
set notif_user [ad_conn user_id]
}
Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -r1.93.2.21 -r1.93.2.22
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 17 Jul 2020 13:03:38 -0000 1.93.2.21
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 21 Jul 2020 14:02:09 -0000 1.93.2.22
@@ -450,7 +450,11 @@
ns_log Error "ns_ictl trace returned: $errorMsg"
}
}
-
+ ns_ictl trace idle {
+ ns_log notice =====IDLE=====START
+ ::xo::broadcast receive
+ ns_log notice =====IDLE=====END
+ }
#
# Register::xo::at_delete function only once
#
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -r1.76.2.33 -r1.76.2.34
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 14 Jul 2020 19:43:09 -0000 1.76.2.33
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 21 Jul 2020 14:02:09 -0000 1.76.2.34
@@ -938,7 +938,7 @@
CrItem instproc current_user_id {} {
if {[nsf::is object ::xo::cc]} {return [::xo::cc user_id]}
- if {[ad_conn isconnected]} {return [ad_conn user_id]}
+ if {[ns_conn isconnected]} {return [ad_conn user_id]}
return ""
}
Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v
diff -u -r1.67.2.25 -r1.67.2.26
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 15 Jul 2020 10:38:48 -0000 1.67.2.25
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 21 Jul 2020 14:02:09 -0000 1.67.2.26
@@ -1794,7 +1794,7 @@
# the next procs are for the filters (registered from the -init file)
####
throttle proc postauth args {
- # :log "+++ [self proc] [ad_conn url] auth ms [:partialtimes] [ad_conn isconnected]"
+ # :log "+++ [self proc] [ad_conn url] auth ms [:partialtimes] [ns_conn isconnected]"
# :do set ::cookies(${:requestor}) [ns_set get [ns_conn headers] Cookie]
set r [:check]
if {$r < 0} {
@@ -1820,7 +1820,7 @@
}
}
throttle proc trace args {
- # :log "+++ [self proc] <$args> [ad_conn url] [:partialtimes] [ad_conn isconnected]"
+ # :log "+++ [self proc] <$args> [ad_conn url] [:partialtimes] [ns_conn isconnected]"
# OpenACS 5.2 bypasses for requests to /resources the user filter
# in these cases pre- or postauth are not called, but only trace.
# So we have to make sure we have the needed context here