Index: openacs-4/packages/acs-admin/tcl/acs-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/acs-admin-procs.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-admin/tcl/acs-admin-procs.tcl 23 Oct 2020 12:26:10 -0000 1.2.2.2
+++ openacs-4/packages/acs-admin/tcl/acs-admin-procs.tcl 28 Oct 2020 15:39:18 -0000 1.2.2.3
@@ -19,7 +19,7 @@
} {
set openssl [util::which openssl]
- if {[info commands ns_driver] ne "" && $openssl ne ""} {
+ if {[namespace which ns_driver] ne "" && $openssl ne ""} {
#
# Get certificates to check expire dates
#
Index: openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl 15 Aug 2018 16:59:53 -0000 1.5
+++ openacs-4/packages/acs-admin/tcl/apm-admin-init.tcl 28 Oct 2020 15:39:18 -0000 1.5.2.1
@@ -21,7 +21,7 @@
#
ns_register_filter trace GET /repository/* repository-download
- if {[info commands ::xo::db::require] ne ""} {
+ if {[namespace which ::xo::db::require] ne ""} {
::xo::db::require table apm_package_downloads {
time timestamp
ip text
Index: openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl,v
diff -u -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl 19 May 2020 19:15:36 -0000 1.1.2.6
+++ openacs-4/packages/acs-admin/tcl/site-wide-procs.tcl 28 Oct 2020 15:39:18 -0000 1.1.2.7
@@ -72,7 +72,7 @@
# Flush site node cache to avoid potential bootstrap
# problems.
#
- if {[info commands ::xo::site_node] ne ""} {
+ if {[namespace which ::xo::site_node] ne ""} {
xo::site_node flush_pattern id-$path*
}
Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v
diff -u -r1.12.2.3 -r1.12.2.4
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 30 Mar 2019 19:59:52 -0000 1.12.2.3
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl 28 Oct 2020 15:39:18 -0000 1.12.2.4
@@ -73,7 +73,7 @@
} -validate {
{proc
- { {info commands ::$proc} ne "" }
+ { {namespace which ::$proc} ne "" }
{The specified procedure name does not exist. Is the -procs.tcl file loaded?}
}
{proc
Index: openacs-4/packages/acs-admin/www/install/install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-3.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-admin/www/install/install-3.tcl 3 Jul 2020 07:43:20 -0000 1.11.2.2
+++ openacs-4/packages/acs-admin/www/install/install-3.tcl 28 Oct 2020 15:39:18 -0000 1.11.2.3
@@ -197,7 +197,7 @@
#
# - fix the behavior in AOLserver
#
- if {[info commands ::nstrace::statescript] ne ""} {
+ if {[namespace which ::nstrace::statescript] ne ""} {
#
# NaviServer variant:
# - nstrace::statescript produces the blueprint
Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -r1.72.2.23 -r1.72.2.24
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 17 Feb 2020 20:17:23 -0000 1.72.2.23
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 28 Oct 2020 15:39:18 -0000 1.72.2.24
@@ -409,7 +409,7 @@
array set default_values $doc_elements(default_values)
if {![info exists label]} {
- if {[llength $proc_name] > 1 && [info commands ::xo::api] ne ""} {
+ if {[llength $proc_name] > 1 && [namespace which ::xo::api] ne ""} {
set label [::xo::api method_label $proc_name]
} else {
set label $proc_name
@@ -438,7 +438,7 @@
append out $first_line_tag$pretty_name$end_tag
if {[regexp {^(.*) (inst)?proc (.*)$} $proc_name match cl prefix method]
- && [info commands ::xo::api] ne ""
+ && [namespace which ::xo::api] ne ""
} {
set xotclArgs 1
set scope ""
@@ -450,7 +450,7 @@
}
} else {
set xotclArgs 0
- if {[info commands ::xo::api] ne "" && [::xo::api isclass "" [lindex $proc_name 1]]} {
+ if {[namespace which ::xo::api] ne "" && [::xo::api isclass "" [lindex $proc_name 1]]} {
set name [lindex $proc_name 1]
set pretty_proc_name "[$name info class] [::xo::api object_link {} $name]"
} else {
@@ -736,8 +736,9 @@
} else {
append out $label
}
- set debug_html [expr {$include_debug_controls_p && [info commands ::xo::api] ne ""
- ? [::xo::api debug_widget $proc] : ""}]
+ set debug_html [expr {$include_debug_controls_p
+ && [namespace which ::xo::api] ne ""
+ ? [::xo::api debug_widget $proc] : ""}]
}
if {[nsv_exists api_proc_doc $proc]} {
set doc_elements [nsv_get api_proc_doc $proc]
@@ -1067,7 +1068,7 @@
#
set called_procs {}
foreach c [api_called_proc_names -proc_name $proc_name] {
- if {[info commands $c] eq $c
+ if {[namespace which $c] eq $c
&& $c ni $callers
&& $c ne $proc_name
} {
@@ -1146,7 +1147,7 @@
#
regsub -all {([?*])} $proc_name {\\\1} proc_name_pattern
- if {[info commands ::xo::api] ne ""
+ if {[namespace which ::xo::api] ne ""
&& [regexp {^(.*) (inst)?proc (.*)$} $proc_name match obj prefix method]} {
if {[regexp {^(.*) (.*)$} $obj match scope obj]} {
if {[::xo::api scope_eval $scope ::nsf::is object $obj]} {
@@ -1158,10 +1159,10 @@
}
}
return ""
- } elseif {[info commands ::xo::api] ne ""
+ } elseif {[namespace which ::xo::api] ne ""
&& [regexp {^([^ ]+) (Class|Object) (.*)$} $proc_name . thread kind obj]} {
return [::xo::api get_object_source $thread $obj]
- } elseif {[info commands ::xo::api] ne ""
+ } elseif {[namespace which ::xo::api] ne ""
&& [regexp {(Class|Object) (.*)$} $proc_name . kind obj]} {
return [::xo::api get_object_source "" $obj]
} elseif {[info procs $proc_name_pattern] ne ""} {
@@ -1446,7 +1447,7 @@
} {
- if {[info commands ::xo::api] ne ""} {
+ if {[namespace which ::xo::api] ne ""} {
set scope [::xo::api scope_from_proc_index $proc_name]
} else {
set scope ""
@@ -1625,7 +1626,7 @@
# to api-doc pages. Perhaps we should hyperlink them to the Tcl man pages?
# else and elseif are be treated as special cases later
- if {[info commands ::xo::api] ne ""} {
+ if {[namespace which ::xo::api] ne ""} {
set XOTCL_KEYWORDS [list self my next]
# Only command names are highlighted, otherwise we could add XOTcl method
# names by [lsort -unique [concat [list self my next] ..
@@ -1810,8 +1811,9 @@
} elseif {[string match "*__arg_parser" $proc_name]} {
append html [pretty_token helper $proc_name]
- } elseif {$proc_namespace ne ""
- && [info commands ::${proc_namespace}::${proc_name}] ne ""} {
+ } elseif {$proc_namespace ne "" && [
+ namespace which ::${proc_namespace}::${proc_name}]
+ ne ""} {
if {[is_object $scope ${proc_namespace}::${proc_name}]} {
set url [::xo::api object_url \
@@ -1824,10 +1826,11 @@
append html "<a href='[ns_quotehtml $url]' title='API command'>" \
[pretty_token proc $proc_name] </a>
}
- } elseif {[info commands ::$proc_name] ne ""} {
- set absolute_name [expr {[string match "::*" $proc_name]
- ? $proc_name
- : "::${proc_name}"}]
+ } elseif {[namespace which ::$proc_name] ne ""} {
+ set absolute_name [expr {
+ [string match "::*" $proc_name]
+ ? $proc_name : "::${proc_name}"
+ }]
if {[is_object $scope $absolute_name]} {
set url [::xo::api object_url \
-show_source 1 -show_methods 2 \
Index: openacs-4/packages/acs-api-browser/tcl/test/acs-api-browser-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/test/acs-api-browser-procs.tcl,v
diff -u -r1.4.2.19 -r1.4.2.20
--- openacs-4/packages/acs-api-browser/tcl/test/acs-api-browser-procs.tcl 14 Aug 2020 12:32:30 -0000 1.4.2.19
+++ openacs-4/packages/acs-api-browser/tcl/test/acs-api-browser-procs.tcl 28 Oct 2020 15:39:18 -0000 1.4.2.20
@@ -212,11 +212,15 @@
aa_true "A bogus proc returns the empty string" \
{[api_proc_pretty_name -include_debug_controls -link -hints_only $bogus_proc] eq ""}
- aa_true "Hints are printed in parenthesys, the proc type belongs to the hints" \
- [regexp "^\(.*$proc_type.*\)$" [string trim [api_proc_pretty_name -proc_type $proc_type -hints_only $proc]]]
+ aa_true "Hints are printed in parentheses, the proc type belongs to the hints" [
+ regexp "^\(.*$proc_type.*\)$" [string trim [
+ api_proc_pretty_name -proc_type $proc_type -hints_only $proc]]]
- aa_true "-include_debug_controls prints out a form when XOTcl is installed" \
- {[info commands ::xo::api] eq "" || [regexp {^.*<form[^>]*>.*</form[^>]*.*$} [api_proc_pretty_name -include_debug_controls $proc]]}
+ aa_true "-include_debug_controls prints out a form when XOTcl is installed" {
+ [namespace which ::xo::api] eq "" || [
+ regexp {^.*<form[^>]*>.*</form[^>]*.*$} [
+ api_proc_pretty_name -include_debug_controls $proc]]
+ }
aa_true "-link will put the proc URL somewhere" \
[string match "*[ns_quotehtml [api_proc_url $proc]]*" [api_proc_pretty_name -link $proc]]
@@ -348,18 +352,20 @@
set commands [list]
foreach command [info commands] {
# Skip XOTcl methods
- if {[info commands ::xotcl::Object] ne "" && [::xotcl::Object isobject [lindex $command 0]]} {
+ if {[namespace which ::xotcl::Object] ne ""
+ && [::xotcl::Object isobject [lindex $command 0]]} {
continue
}
- # Skip some corner-case command names created by the platform... is this a bug or not?
+ # Skip some corner-case command names created by the platform... is
+ # this a bug or not?
if {![regexp {(template_tag_listfilters|AcsSc\.|validator1\.|!|^_[^ ]|^\d+)} $command]} {
lappend commands $command
}
if {[llength $commands] >= 50} {
break
}
}
- if {[info commands ::xotcl::Object] ne ""} {
+ if {[namespace which ::xotcl::Object] ne ""} {
aa_log "Adding a few XOTcl classes"
lappend commands {*}[lrange [::xotcl::Object info instances] 0 100]
}
Index: openacs-4/packages/acs-api-browser/www/proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.tcl,v
diff -u -r1.16.2.4 -r1.16.2.5
--- openacs-4/packages/acs-api-browser/www/proc-view.tcl 1 Apr 2019 16:43:06 -0000 1.16.2.4
+++ openacs-4/packages/acs-api-browser/www/proc-view.tcl 28 Oct 2020 15:39:18 -0000 1.16.2.5
@@ -89,12 +89,12 @@
}
</pre></p>
}]
- } elseif {[info commands $absolute_proc] eq $absolute_proc} {
+ } elseif {[namespace which $absolute_proc] eq $absolute_proc} {
#
# In case the cmd is an object, redirect to the object browser
#
- if {[info commands ::nsf::is] ne "" && [nsf::is object $absolute_proc]} {
+ if {[namespace which ::nsf::is] ne "" && [nsf::is object $absolute_proc]} {
ad_returnredirect [export_vars -base /xotcl/show-object {{object $absolute_proc}}]
ad_script_abort
}
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.79.2.32 -r1.79.2.33
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 15 Oct 2020 10:08:34 -0000 1.79.2.32
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 28 Oct 2020 15:39:18 -0000 1.79.2.33
@@ -68,7 +68,7 @@
}
}
::proc $proc_name_new $args $new_body
- } elseif {$::acs::useNsfProc && [info commands $proc_name_old] ne ""} {
+ } elseif {$::acs::useNsfProc && [namespace which $proc_name_old] ne ""} {
#
# We copy a nsf::proc
#
Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v
diff -u -r1.32.2.5 -r1.32.2.6
--- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 11 Jun 2019 18:55:08 -0000 1.32.2.5
+++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 28 Oct 2020 15:39:18 -0000 1.32.2.6
@@ -143,7 +143,7 @@
}
# AOLserver must support ns_cache.
-if {[info commands ns_cache] eq ""} {
+if {[namespace which ns_cache] eq ""} {
append errors "<li><p><strong>The <code>ns_cache</code> module is not installed. This is required for OpenACS."
set error_p 1
}
Index: openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl 7 Aug 2017 23:47:46 -0000 1.3
+++ openacs-4/packages/acs-bootstrap-installer/installer/tcl/0-acs-init.tcl 28 Oct 2020 15:39:19 -0000 1.3.2.1
@@ -35,7 +35,7 @@
set ::acs::pageroot [expr {$::acs::useNaviServer ? [ns_server pagedir] : [ns_info pageroot]}]
set ::acs::tcllib [expr {$::acs::useNaviServer ? [ns_server tcllib] : [ns_info tcllib]}]
set ::acs::rootdir [file dirname [string trimright $::acs::tcllib "/"]]
- set ::acs::useNsfProc [expr {[info commands ::nsf::proc] ne ""}]
+ set ::acs::useNsfProc [expr {[namespace which ::nsf::proc] ne ""}]
}
# Determine the OpenACS root directory, which is the directory right above the
@@ -53,7 +53,7 @@
# Check that the appropriate version of tDom (http://www.tdom.org)
# is installed and spit out a comment or try to install it if not.
#
- if {[info commands domNode] eq ""} {
+ if {[namespace which domNode] eq ""} {
if {[ns_info version] < 4} {
ns_log Error "0-acs-init.tcl: domNode command not found -- libtdom.so not loaded?"
} elseif {[ns_info version] >= 4} {
Index: openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 24 Nov 2019 11:03:38 -0000 1.10.2.3
+++ openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl 28 Oct 2020 15:39:19 -0000 1.10.2.4
@@ -87,7 +87,7 @@
# e.g. the blank master is installed before the subsite definitions
# for the page_plugin callback. Templates are required to be very
# robust.
-if {[info commands ::callback::subsite::page_plugin::*] ne ""} {
+if {[llength [info commands ::callback::subsite::page_plugin::*]]} {
callback subsite::page_plugin
}
@@ -213,7 +213,7 @@
# Determine if developer support is installed and enabled
#
-if {[llength [info commands ::ds_show_p]] == 1 && [ds_show_p]} {
+if {[namespace which ::ds_show_p] ne {} && [ds_show_p]} {
template::head::add_css \
-href "/resources/acs-developer-support/acs-developer-support.css" \
-media "all"
@@ -271,7 +271,7 @@
# blocked out.
#
if {[parameter::get -parameter CSPEnabledP -package_id [ad_acs_kernel_id] -default 0]
- && [info commands ::security::csp::render] ne ""
+ && [namespace which ::security::csp::render] ne ""
} {
set csp [::security::csp::render]
if {$csp ne ""} {
Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v
diff -u -r1.66.2.11 -r1.66.2.12
--- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 12 Aug 2020 13:31:19 -0000 1.66.2.11
+++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 28 Oct 2020 15:39:19 -0000 1.66.2.12
@@ -530,7 +530,7 @@
if { $callback ne "" && $impl ne "" } {
- if { [info commands "::callback::${callback}::contract__arg_parser"] eq "" } {
+ if { [namespace which ::callback::${callback}::contract__arg_parser] eq "" } {
# We create a dummy arg parser for the contract in case
# the contract hasn't been defined yet. We need this
# because the implementation doesn't tell us what the
@@ -943,7 +943,7 @@
# arg validation -- ::callback::${callback}::contract is an
# empty function that only runs the ad_proc generated arg parser.
- if {[info commands ::callback::${callback}::contract] eq ""} {
+ if {[namespace which ::callback::${callback}::contract] eq ""} {
error "Undefined callback $callback"
}
::callback::${callback}::contract {*}$args
Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.50.2.2 -r1.50.2.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 13 Jul 2020 12:02:33 -0000 1.50.2.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 28 Oct 2020 15:39:19 -0000 1.50.2.3
@@ -451,7 +451,7 @@
# Call db_release_unused_handles, only if the library defining it
# (10-database-procs.tcl) has been sourced yet.
- if { [info commands db_release_unused_handles] ne ""} {
+ if { [namespace which db_release_unused_handles] ne ""} {
db_release_unused_handles
}
}
Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v
diff -u -r1.49.2.2 -r1.49.2.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 13 Jul 2020 12:02:33 -0000 1.49.2.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 28 Oct 2020 15:39:19 -0000 1.49.2.3
@@ -16,7 +16,7 @@
# The following code allows ad_proc to be used
# here (a local workalike is declared if absent).
# added 2002-09-11 Jeff Davis (davis@xarg.net)
-if {[info commands ad_library] ne "" } {
+if {[namespace which ad_library] ne "" } {
ad_library {
Query Dispatching for multi-RDBMS capability
@@ -26,7 +26,7 @@
}
}
-if { [info commands ad_proc] ne ""} {
+if { [namespace which ad_proc] ne ""} {
set remove_ad_proc_p 0
} else {
set remove_ad_proc_p 1
@@ -237,7 +237,7 @@
}
# small compatibility function to avoid existence checks at runtime
-if {[info commands ::nsf::strip_proc_name] eq ""} {
+if {[namespace which ::nsf::strip_proc_name] eq ""} {
namespace eval ::nsf {
proc ::nsf::strip_proc_name {name} {return $name}
}
Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 3 Jul 2020 07:27:29 -0000 1.18.2.2
+++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl 28 Oct 2020 15:39:19 -0000 1.18.2.3
@@ -325,7 +325,7 @@
@param filename Filename of image file
} {
- if {[info commands ns_imgmime] ne ""} {
+ if {[namespace which ns_imgmime] ne ""} {
set mime_type [ns_imgmime $filename]
if {$mime_type ne "image/unknown"} {
return $mime_type
Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 3 Jul 2020 07:27:29 -0000 1.19.2.2
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 28 Oct 2020 15:39:19 -0000 1.19.2.3
@@ -198,7 +198,7 @@
} {
- return [expr {[info commands ${namespace_name}::$proc_name] ne ""}]
+ return [expr {[namespace which ${namespace_name}::$proc_name] ne ""}]
}
##########################################################
Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v
diff -u -r1.37.2.3 -r1.37.2.4
--- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 3 Jul 2020 07:27:29 -0000 1.37.2.3
+++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 28 Oct 2020 15:39:19 -0000 1.37.2.4
@@ -117,7 +117,7 @@
ns_set put [ns_conn outputheaders] "Content-Length" 0
ns_return 200 text/plain {}
} else {
- if {[info commands ad_returnfile_background] eq "" || [security::secure_conn_p]} {
+ if {[namespace which ad_returnfile_background] eq "" || [security::secure_conn_p]} {
ns_returnfile 200 $mime_type $filename
} else {
ad_returnfile_background 200 $mime_type $filename
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -r1.64.2.3 -r1.64.2.4
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 16 Dec 2019 10:49:51 -0000 1.64.2.3
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 28 Oct 2020 15:39:19 -0000 1.64.2.4
@@ -555,7 +555,7 @@
ad_proc -private ds_ad_conn { args } {
Get the "real" user id.
} {
- if {[info commands orig_ad_conn] ne ""} {
+ if {[namespace which orig_ad_conn] ne ""} {
return [orig_ad_conn {*}$args]
} else {
return [ad_conn {*}$args]
@@ -636,7 +636,7 @@
Replace the ad_get_user procs with our own versions
} {
if { $enabled_p } {
- if { [info commands orig_ad_conn] eq ""} {
+ if { [namespace which orig_ad_conn] eq ""} {
#ds_comment "Enabling user-switching"
# let the user stay who he is now (but ignore any error trying to do so)
catch {
@@ -649,7 +649,7 @@
}
} else {
#ds_comment "Disabling user-switching"
- if { [info commands orig_ad_conn] ne ""} {
+ if { [namespace which orig_ad_conn] ne ""} {
rename ad_conn {}
rename orig_ad_conn ad_conn
}
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -r1.108.2.10 -r1.108.2.11
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 1 Sep 2020 14:26:27 -0000 1.108.2.10
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 28 Oct 2020 15:39:19 -0000 1.108.2.11
@@ -716,7 +716,7 @@
# "ns_smtpd" can be used, when it is available and no
# password mode is specified.
#
- if { [info commands ns_smtpd] eq ""
+ if { [namespace which ns_smtpd] eq ""
|| [dict get $deliveryDict SMTPPassword] ne ""
|| [dict get $deliveryDict SMTPUser] ne ""
} {
Index: openacs-4/packages/acs-mail-lite/tcl/test/email-inbound-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/test/email-inbound-procs.tcl,v
diff -u -r1.7.2.6 -r1.7.2.7
--- openacs-4/packages/acs-mail-lite/tcl/test/email-inbound-procs.tcl 13 Oct 2020 11:53:01 -0000 1.7.2.6
+++ openacs-4/packages/acs-mail-lite/tcl/test/email-inbound-procs.tcl 28 Oct 2020 15:39:19 -0000 1.7.2.7
@@ -387,7 +387,7 @@
aa_true "ref424. acs_mail_lite::imap_conn_go -conn_id ''" $sid4_p
aa_log "Checking whether ns_imap is installed..."
- set ns_imap_p [expr {[info commands ns_imap] ne ""}]
+ set ns_imap_p [expr {[namespace which ns_imap] ne ""}]
set enabled [expr {$ns_imap_p ?
"enabled. Activating additional tests" :
"disabled. Some tests will be skipped"}]
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v
diff -u -r1.33.2.3 -r1.33.2.4
--- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 1 Sep 2020 17:37:10 -0000 1.33.2.3
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 28 Oct 2020 15:39:19 -0000 1.33.2.4
@@ -57,14 +57,14 @@
set proc_name [acs_sc_generate_name $contract $impl $operation]
- if { [info commands $proc_name] ne "" } {
+ if { [namespace which $proc_name] ne "" } {
return [ad_apply $proc_name $call_args]
}
if { $error_p } {
error "Operation $operation is not implemented in '$impl' implementation of contract '$contract'"
} else {
- ns_log warning "ACS-SC: Function Not Found: $proc_name [info commands $proc_name]"
+ ns_log warning "ACS-SC: Function Not Found: $proc_name [namespace which $proc_name]"
}
return
}
@@ -253,7 +253,7 @@
# Check, if the wrapper exists already
#
set proc_name [acs_sc_generate_name $impl_contract_name $impl_name $impl_operation_name]
- if {[info commands ::$proc_name] eq ""} {
+ if {[namespace which ::$proc_name] eq ""} {
#
# Create it new.
#
Index: openacs-4/packages/acs-service-contract/www/binding-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-display.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-service-contract/www/binding-display.tcl 17 May 2018 14:17:35 -0000 1.8
+++ openacs-4/packages/acs-service-contract/www/binding-display.tcl 28 Oct 2020 15:39:19 -0000 1.8.2.1
@@ -42,29 +42,28 @@
}
db_multirow -extend {check} binding binding {
- select impl_operation_name, impl_alias, impl_pl
- from acs_sc_impl_aliases
+ select impl_operation_name, impl_alias, impl_pl
+ from acs_sc_impl_aliases
where impl_name = :impl_name and impl_contract_name = :contract_name
order by lower(impl_operation_name)
-
} {
if {$impl_pl eq "TCL"} {
regsub {^::} $impl_alias {} impl_alias
- if {[info commands ::$impl_alias] ne ""} {
+ if {[namespace which ::$impl_alias] ne ""} {
append impl_alias "</b> {[info args ::$impl_alias]}"
- } elseif {[llength $impl_alias] > 1
- && [info commands ::xotcl::Object] ne ""
- && [::xotcl::Object isobject [lindex $impl_alias 0]]
- && [[lindex $impl_alias 0] info methods [lindex $impl_alias 1]] ne ""} {
- # - it looks like a method,
- # - we have XOTcl installed,
- # - the first word is an object,
- # - the second word is a method for the object,
- # ... so provide a link to the XOTcl API browser
- set href "/xotcl/show-object?object=[lindex $impl_alias 0]&show_methods=2"
- append impl_alias "<a href='[ns_quotehtml $href]'>" \
- "<img border='0' src='/resources/acs-subsite/ZoomIn16.gif'></a>"
- } else {
+ } elseif {[llength $impl_alias] > 1
+ && [namespace which ::xotcl::Object] ne ""
+ && [::xotcl::Object isobject [lindex $impl_alias 0]]
+ && [[lindex $impl_alias 0] info methods [lindex $impl_alias 1]] ne ""} {
+ # - it looks like a method,
+ # - we have XOTcl installed,
+ # - the first word is an object,
+ # - the second word is a method for the object,
+ # ... so provide a link to the XOTcl API browser
+ set href "/xotcl/show-object?object=[lindex $impl_alias 0]&show_methods=2"
+ append impl_alias "<a href='[ns_quotehtml $href]'>" \
+ "<img border='0' src='/resources/acs-subsite/ZoomIn16.gif'></a>"
+ } else {
append impl_alias {</b> - <b style="color: red">NOT FOUND!</b>}
}
set impl_alias "<b>$impl_alias"
Index: openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl,v
diff -u -r1.13.2.5 -r1.13.2.6
--- openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl 31 Aug 2020 12:42:21 -0000 1.13.2.5
+++ openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl 28 Oct 2020 15:39:19 -0000 1.13.2.6
@@ -131,7 +131,7 @@
5.2.0a2 5.2.0a3 {
db_transaction {
db_foreach select_group_name {select group_id, group_name from groups} {
- if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
+ if { [namespace which ::lang::util::convert_to_i18n] ne "" } {
set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
} else {
set pretty_name "$group_name"
@@ -154,7 +154,7 @@
5.2.0a2 5.2.0a3 {
db_transaction {
db_foreach select_group_name {select group_id, group_name from groups} {
- if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
+ if { [namespace which ::lang::util::convert_to_i18n] ne "" } {
set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
} else {
set pretty_name "$group_name"
Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v
diff -u -r1.20.2.6 -r1.20.2.7
--- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 3 Sep 2020 09:16:41 -0000 1.20.2.6
+++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 28 Oct 2020 15:39:19 -0000 1.20.2.7
@@ -368,7 +368,7 @@
if {$datatype eq "enumeration"} {
return 1
}
- if { [info commands "::template::data::validate::$datatype"] eq "" } {
+ if { [namespace which ::template::data::validate::$datatype] eq "" } {
return 0
}
return 1
Index: openacs-4/packages/acs-subsite/www/shared/ajax/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/ajax/chat.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/acs-subsite/www/shared/ajax/chat.tcl 14 Jun 2019 09:26:11 -0000 1.1.2.3
+++ openacs-4/packages/acs-subsite/www/shared/ajax/chat.tcl 28 Oct 2020 15:39:19 -0000 1.1.2.4
@@ -14,7 +14,7 @@
{mode ""}
}
-if {[info commands ::xo::ChatClass] eq "" ||
+if {[namespace which ::xo::ChatClass] eq "" ||
![::xo::ChatClass is_chat_p $class]} {
ns_returnnotfound
Index: openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl,v
diff -u -r1.1.2.15 -r1.1.2.16
--- openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl 26 Sep 2020 11:40:52 -0000 1.1.2.15
+++ openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl 28 Oct 2020 15:39:19 -0000 1.1.2.16
@@ -6,7 +6,7 @@
@author Gustaf Neumann
}
-if {[info commands ::try] eq ""} {
+if {[namespace which ::try] eq ""} {
package require try
ns_log warning "*******************************************"
ns_log warning "* This version of OpenACS requires Tcl 8.6"
@@ -107,7 +107,7 @@
# can be relatively easy emulated, and other one, which can't be
# emulated.
#
-if {[info commands ns_base64urlencode] eq ""} {
+if {[namespace which ns_base64urlencode] eq ""} {
#
# Compatibility for AOLserver or NaviServer before 4.99.17
#
@@ -119,7 +119,7 @@
}
}
-if {[info commands ::ns_dbquotelist] eq ""} {
+if {[namespace which ::ns_dbquotelist] eq ""} {
ad_proc -public ns_dbquotelist {
list
{type text}
Index: openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl,v
diff -u -r1.1.2.17 -r1.1.2.18
--- openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 22 Sep 2020 08:44:53 -0000 1.1.2.17
+++ openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 28 Oct 2020 15:39:19 -0000 1.1.2.18
@@ -2346,7 +2346,7 @@
}
}
-if {[info commands ns_cache_transaction_begin] eq ""} {
+if {[namespace which ns_cache_transaction_begin] eq ""} {
#
# When the server has no support for ns_cache_transaction_*,
# provide dummy procs to avoid run time "if" statements.
Index: openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl 11 Jun 2019 18:55:08 -0000 1.4.2.1
+++ openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl 28 Oct 2020 15:39:19 -0000 1.4.2.2
@@ -12,7 +12,7 @@
# Define dummy stubs in case the required commands are not available.
#
foreach one_proc {ns_startcontent ns_encodingfortype} {
- if {[info commands $one_proc] eq ""} {
+ if {[namespace which $one_proc] eq ""} {
proc $one_proc {args} { }
}
}
Index: openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl 7 Aug 2017 23:47:59 -0000 1.7
+++ openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl 28 Oct 2020 15:39:19 -0000 1.7.2.1
@@ -12,11 +12,11 @@
# on whether clustering is enabled and what command is available for
# cluster-wide flushing.
-if {[info commands ncf.send] ne ""} {
+if {[namespace which ncf.send] ne ""} {
set flush_body {
ncf.send util_memoize $script
}
-} elseif {[server_cluster_enabled_p] && [info commands server_cluster_httpget_from_peers] ne ""} {
+} elseif {[server_cluster_enabled_p] && [namespace which server_cluster_httpget_from_peers] ne ""} {
set flush_body {
server_cluster_httpget_from_peers "/SYSTEM/flush-memoized-statement.tcl?statement=[ns_urlencode $script]"
}
Index: openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl,v
diff -u -r1.12.2.5 -r1.12.2.6
--- openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl 10 Aug 2019 14:33:26 -0000 1.12.2.5
+++ openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl 28 Oct 2020 15:39:19 -0000 1.12.2.6
@@ -23,7 +23,7 @@
set ok_p 1
- if {[info commands ::tdom] eq ""} {
+ if {[namespace which ::tdom] eq ""} {
set xml_status_msg "tDOM is not installed! You must have tDOM installed, or nothing will work."
set ok_p 0
}
Index: openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl,v
diff -u -r1.10.2.10 -r1.10.2.11
--- openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 4 Aug 2020 09:35:16 -0000 1.10.2.10
+++ openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl 28 Oct 2020 15:39:19 -0000 1.10.2.11
@@ -63,7 +63,7 @@
::acs::clusterwide ns_cache flush [:cache_name $partition_key] $key
}
- if {[info commands ns_cache_eval] ne ""} {
+ if {[namespace which ns_cache_eval] ne ""} {
#
# NaviServer variant
#
@@ -275,7 +275,7 @@
}
}
- if {[info commands ns_cache_eval] ne ""} {
+ if {[namespace which ns_cache_eval] ne ""} {
#
# NaviServer variant
#
Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl,v
diff -u -r1.47.2.4 -r1.47.2.5
--- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 22 Jul 2020 12:28:42 -0000 1.47.2.4
+++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 28 Oct 2020 15:39:19 -0000 1.47.2.5
@@ -350,7 +350,7 @@
@see permission::permission_p
} {
- if {[info commands ::acs::permission_cache] eq ""} {
+ if {[namespace which ::acs::permission_cache] eq ""} {
return
} elseif {[info exists party_id] && [info exists object_id] && [info exists privilege]} {
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -r1.45.2.3 -r1.45.2.4
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 13 Jul 2020 12:02:33 -0000 1.45.2.3
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 28 Oct 2020 15:39:19 -0000 1.45.2.4
@@ -458,7 +458,7 @@
ns_log notice "we can use the http::util:: interface using the $httpImpls implementation"
set result [util::http::get -url $url -timeout $timeout -spool]
file rename [dict get $result file] $output_file_name
- } elseif {[info commands ::ns_http] ne "" && [apm_version_names_compare [ns_info patchlevel] "4.99.5"] == 1} {
+ } elseif {[namespace which ::ns_http] ne "" && [apm_version_names_compare [ns_info patchlevel] "4.99.5"] == 1} {
#
# ... use ns_http when we have a version with the "-file" flag ...
#
@@ -474,7 +474,7 @@
ns_log notice "Transfer $url redirected to $location ..."
set url $location
}
- } elseif {[info commands ::xo::HttpRequest] ne ""} {
+ } elseif {[namespace which ::xo::HttpRequest] ne ""} {
#
# ... use xo::HttpRequest...
#
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.126.2.11 -r1.126.2.12
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 29 Jul 2020 13:28:34 -0000 1.126.2.11
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 28 Oct 2020 15:39:19 -0000 1.126.2.12
@@ -677,7 +677,7 @@
@author Peter Marklund
} {
# If acs-lang hasn't been installed yet we simply return
- if { [info commands lang::catalog::import] eq "" || ![apm_package_installed_p acs-lang] } {
+ if { [namespace which lang::catalog::import] eq "" || ![apm_package_installed_p acs-lang] } {
return
}
@@ -2293,7 +2293,7 @@
@creation-date 2004-06-16
} {
set name [xml_node_get_name $node]
- set command [info commands ::install::xml::${type}::${name}]
+ set command [namespace which ::install::xml::${type}::${name}]
if {$command eq ""} {
error "Error: got bad node \"$name\""
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.114.2.18 -r1.114.2.19
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 20 Oct 2020 12:21:48 -0000 1.114.2.18
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 28 Oct 2020 15:39:19 -0000 1.114.2.19
@@ -1458,7 +1458,7 @@
set procedure_name [string tolower "[string trim $package_key]_post_instantiation"]
# Change all "-" to "_" to mimic our Tcl standards
regsub -all {\-} $procedure_name "_" procedure_name
- if { [info commands ::$procedure_name] eq "" } {
+ if { [namespace which ::$procedure_name] eq "" } {
# No such procedure exists...
return ""
}
@@ -1768,7 +1768,7 @@
@author Peter Marklund
} {
- if { [info commands ::$proc_name] eq "" } {
+ if { [namespace which ::$proc_name] eq "" } {
return 0
}
@@ -1784,7 +1784,7 @@
return [expr {[info args ::$proc_name] eq ""}]
}
- if {[info commands ::nsf::cmd::info] ne ""} {
+ if {[namespace which ::nsf::cmd::info] ne ""} {
#
# We can compare the signature of via nsf procs
#
Index: openacs-4/packages/acs-tcl/tcl/callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/callback-procs.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-tcl/tcl/callback-procs.tcl 7 Aug 2017 23:47:59 -0000 1.3
+++ openacs-4/packages/acs-tcl/tcl/callback-procs.tcl 28 Oct 2020 15:39:19 -0000 1.3.2.1
@@ -12,7 +12,7 @@
} {
Returns whether the specified implementation exists.
} {
- return [expr {[info commands ::callback::${callback}::impl::${impl}] ne ""}]
+ return [expr {[namespace which ::callback::${callback}::impl::${impl}] ne ""}]
}
ad_proc -public callback::get_object_type_impl {
Index: openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl,v
diff -u -r1.29.2.9 -r1.29.2.10
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 6 Aug 2020 13:09:53 -0000 1.29.2.9
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl 28 Oct 2020 15:39:19 -0000 1.29.2.10
@@ -866,7 +866,7 @@
} else {
set curriculum_bar ""
}
- if { [info commands ds_link] ne "" } {
+ if { [namespace which ds_link] ne "" } {
set ds_link [ds_link]
} else {
set ds_link ""
@@ -913,7 +913,7 @@
@see Documentation on the site master template for the proper way to standardize page footers
} {
- if { [info commands ds_link] ne "" } {
+ if { [namespace which ds_link] ne "" } {
set ds_link [ds_link]
} else {
set ds_link ""
@@ -3601,7 +3601,7 @@
@see "info commands" based idioms
} {
- if { [info commands $proc] ne "" } {
+ if { [namespace which $proc] ne "" } {
$proc {*}$args
}
}
Index: openacs-4/packages/acs-tcl/tcl/ds-stub-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/ds-stub-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-tcl/tcl/ds-stub-procs.tcl 10 Dec 2017 15:15:45 -0000 1.6
+++ openacs-4/packages/acs-tcl/tcl/ds-stub-procs.tcl 28 Oct 2020 15:39:19 -0000 1.6.2.1
@@ -12,16 +12,16 @@
@cvs-id $Id$
}
-if {[info commands ds_add] eq ""} {
+if {[namespace which ds_add] eq ""} {
proc ds_add {args} {}
}
-if {[info commands ds_collect_db_call] eq ""} {
+if {[namespace which ds_collect_db_call] eq ""} {
proc ds_collect_db_call {args} {}
}
-if {[info commands ds_collect_connection_info] eq ""} {
+if {[namespace which ds_collect_connection_info] eq ""} {
proc ds_collect_connection_info {} {}
}
-if {[info commands ds_init] eq ""} {
+if {[namespace which ds_init] eq ""} {
proc ds_init {} {}
}
# Local variables:
Index: openacs-4/packages/acs-tcl/tcl/exception-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/exception-procs.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 25 Nov 2019 14:16:26 -0000 1.11.2.2
+++ openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 28 Oct 2020 15:39:19 -0000 1.11.2.3
@@ -11,7 +11,7 @@
#
package require try
}
-if {[info commands "::try"] eq ""} {
+if {[namespace which ::try] eq ""} {
error "This version of OpenACS requires the ::try command (built-in in 8.6+, package for 8.5"
}
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.87.2.8 -r1.87.2.9
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl 19 Dec 2019 19:15:06 -0000 1.87.2.8
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl 28 Oct 2020 15:39:19 -0000 1.87.2.9
@@ -886,17 +886,17 @@
}
default {
- if { [info commands "::template::data::validate::$flag"] eq "" } {
+ if { [namespace which ::template::data::validate::$flag] eq "" } {
return -code error "element $element_name: data type \"$flag\" is not valid"
}
lappend form_command "-datatype" $flag
set af_type(${form_name}__$element_name) $flag
if { $af_element_parameters($element_name:$flag) eq "" } {
- if { [info commands "::template::widget::$flag"] ne "" } {
+ if { [namespace which ::template::widget::$flag] ne "" } {
lappend form_command "-widget" $flag
}
} else {
- if { [info commands "::template::widget::$af_element_parameters($element_name:$flag)"] eq ""} {
+ if { [namespace which ::template::widget::$af_element_parameters($element_name:$flag)] eq "" } {
return -code error "element $element_name: widget \"$af_element_parameters($element_name:$flag)\" does not exist"
}
lappend form_command "-widget" $af_element_parameters($element_name:$flag)
@@ -921,17 +921,17 @@
foreach element_name $af_element_names($form_name) {
if { [llength $element_name] == 1 } {
if { [info exists af_from_sql(${form_name}__$element_name)] } {
- if { [info commands "::template::util::$af_type(${form_name}__$element_name)::acquire"] eq "" } {
+ if { [namespace which ::template::util::$af_type(${form_name}__$element_name)::acquire] eq "" } {
return -code error "\"from_sql\" not valid for type \"$af_type(${form_name}__$element_name)\""
}
}
if { [info exists af_to_sql(${form_name}__$element_name)] } {
- if { [info commands ::template::util::$af_type(${form_name}__$element_name)::get_property] eq "" } {
+ if { [namespace which ::template::util::$af_type(${form_name}__$element_name)::get_property] eq "" } {
return -code error "\"to_sql\" not valid for type \"$af_type(${form_name}__$element_name)\""
}
}
if { [info exists af_to_html(${form_name}__$element_name)] } {
- if { [info commands ::template::util::$af_type(${form_name}__$element_name)::get_property] eq "" } {
+ if { [namespace which ::template::util::$af_type(${form_name}__$element_name)::get_property] eq "" } {
return -code error "\"to_html\" not valid for type \"$af_type(${form_name}__$element_name)\""
}
}
@@ -1024,7 +1024,7 @@
set values($element_name) \
[template::util::$af_type(${form_name}__$element_name)::acquire \
$af_from_sql(${form_name}__$element_name) $values($element_name)]
- } elseif { [info commands ::template::data::from_sql::$af_type(${form_name}__$element_name)] ne "" } {
+ } elseif { [namespace which ::template::data::from_sql::$af_type(${form_name}__$element_name)] ne "" } {
set values($element_name) [template::data::from_sql::$af_type(${form_name}__$element_name) $values($element_name)]
}
}
Index: openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl,v
diff -u -r1.30.2.7 -r1.30.2.8
--- openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl 11 Aug 2020 20:44:38 -0000 1.30.2.7
+++ openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl 28 Oct 2020 15:39:19 -0000 1.30.2.8
@@ -246,10 +246,10 @@
# Since NaviServer 4.99.12 ns_http handles also HTTPS
if {[apm_version_names_compare \
[ns_info patchlevel] "4.99.12"] >= 0} {
- return [info commands ns_http]
+ return [namespace which ns_http]
}
# Default: check if we have ns_ssl
- return [info commands ns_ssl]
+ return [namespace which ns_ssl]
}
ad_proc -private util::http::native_https_api {
@@ -275,7 +275,7 @@
lappend https "curl"
}
- if {[info commands ns_http] ne ""} {
+ if {[namespace which ns_http] ne ""} {
lappend http "native"
}
@@ -1451,7 +1451,7 @@
# zlib is mandatory when requiring compression
if {$gzip_request_p || $gzip_response_p} {
- if {[info commands zlib] eq ""} {
+ if {[namespace which zlib] eq ""} {
return -code error "${this_proc}: zlib support not enabled"
}
}
@@ -1744,7 +1744,7 @@
# zlib is mandatory when compressing the input
if {$gzip_request_p} {
- if {[info commands zlib] eq ""} {
+ if {[namespace which zlib] eq ""} {
return -code error "${this_proc}: zlib support not enabled"
}
}
Index: openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl 8 Aug 2020 11:19:23 -0000 1.2.2.2
+++ openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl 28 Oct 2020 15:39:19 -0000 1.2.2.3
@@ -29,7 +29,7 @@
# after the util_memoize cache was created. Therefore, is safe to
# use the util_memoize when this proc is available.
#
- if {[info commands ::util_memoize_flush] ne ""} {
+ if {[namespace which ::util_memoize_flush] ne ""} {
if {$max_age ne "" && $max_age < 0} {
error "max_age must not be negative"
Index: openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl 8 Aug 2020 11:19:23 -0000 1.9.2.2
+++ openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl 28 Oct 2020 15:39:19 -0000 1.9.2.3
@@ -58,7 +58,7 @@
# after the util_memoize cache was created. Therefore, is safe to
# use the util_memoize when this proc is available.
#
- if {[info commands ::util_memoize_flush] ne ""} {
+ if {[namespace which ::util_memoize_flush] ne ""} {
if {$max_age ne ""} {
set max_age "-expires $max_age"
}
Index: openacs-4/packages/acs-tcl/tcl/proxy-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/proxy-procs.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-tcl/tcl/proxy-procs.tcl 9 Nov 2018 13:18:17 -0000 1.8
+++ openacs-4/packages/acs-tcl/tcl/proxy-procs.tcl 28 Oct 2020 15:39:19 -0000 1.8.2.1
@@ -53,7 +53,7 @@
}
# Now rename exec; protect cases, where file is loaded multiple times
- if {[info commands ::real_exec] eq ""} {rename exec real_exec}
+ if {[namespace which ::real_exec] eq ""} {rename exec real_exec}
ad_proc exec {args} {This is the wrapped version of exec} {proxy::exec -call $args}
}
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.153.2.26 -r1.153.2.27
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 26 Sep 2020 11:40:52 -0000 1.153.2.26
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 28 Oct 2020 15:39:19 -0000 1.153.2.27
@@ -494,7 +494,7 @@
@author Don Baccus (dhogaza@pacifier.com)
} {
- if {[info commands ::valgrind] ne ""} {
+ if {[namespace which ::valgrind] ne ""} {
::valgrind start
}
@@ -1982,18 +1982,18 @@
# this is written for NaviServer 4.99.1 or newer
foreach filter {rp_filter rp_resources_filter rp_request_denied_filter} {
set cmd ${filter}_aolserver
- if {[info commands $cmd] ne ""} {rename $cmd ""}
+ if {[namespace which $cmd] ne ""} {rename $cmd ""}
rename $filter $cmd
proc $filter {why} "$cmd \$why"
}
set cmd rp_invoke_filter_conn
- if {[info commands $cmd] ne ""} {rename $cmd ""}
+ if {[namespace which $cmd] ne ""} {rename $cmd ""}
rename rp_invoke_filter $cmd
proc rp_invoke_filter { why filter_info} "$cmd _ \$filter_info \$why"
set cmd rp_invoke_proc_conn
- if {[info commands $cmd] ne ""} {rename $cmd ""}
+ if {[namespace which $cmd] ne ""} {rename $cmd ""}
rename rp_invoke_proc $cmd
proc rp_invoke_proc { argv } "$cmd _ \$argv"
}
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.39 -r1.126.2.40
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 20 Oct 2020 07:59:16 -0000 1.126.2.39
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 28 Oct 2020 15:39:19 -0000 1.126.2.40
@@ -2172,7 +2172,7 @@
return $::acs::sdriver
}
-if {[info commands ns_driver] ne ""} {
+if {[namespace which ns_driver] ne ""} {
ad_proc -private security::configured_driver_info {} {
@@ -2649,7 +2649,7 @@
}
set secret [ns_config "ns/server/[ns_info server]/acs" parametersecret ""]
- if {[info commands ::crypto::hmac] ne ""} {
+ if {[namespace which ::crypto::hmac] ne ""} {
set token [::crypto::hmac string $secret $session_id-[clock clicks -microseconds]]
} else {
set token [ns_sha1 "$secret-$session_id-[clock clicks -microseconds]"]
@@ -2933,7 +2933,7 @@
set token [set $globalTokenName]
} else {
set secret [ns_config "ns/server/[ns_info server]/acs" parametersecret ""]
- if {[info commands ::crypto::hmac] ne ""} {
+ if {[namespace which ::crypto::hmac] ne ""} {
set token [::crypto::hmac string $secret [session_id]]
} else {
set token [ns_sha1 $secret-[session_id]]
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-init.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-tcl/tcl/site-nodes-init.tcl 11 Jun 2018 09:14:55 -0000 1.8
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-init.tcl 28 Oct 2020 15:39:19 -0000 1.8.2.1
@@ -14,7 +14,7 @@
# In case, we have a recent version of NaviServer, we can use
# ns_urlspace for mapping tree data.
#
-if {[info commands ns_urlspace] ne "" && [info commands ::xo::db::sql::site_node] ne ""} {
+if {[namespace which ns_urlspace] ne "" && [namespace which ::xo::db::sql::site_node] ne ""} {
#
# Prefetch paths, which should not be mapped to the base node "/",
# since these have to go through the classical mapping, where we
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.141.2.27 -r1.141.2.28
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 1 Sep 2020 17:33:01 -0000 1.141.2.27
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 28 Oct 2020 15:39:19 -0000 1.141.2.28
@@ -69,7 +69,7 @@
# which should be turned into mainstream OpenACS after the OpenACS
# 5.10 release.
-if {[info commands ::nx::Object] ne ""
+if {[namespace which ::nx::Object] ne ""
&& [ns_info name] eq "NaviServer"
&& [db_driverkey ""] eq "postgresql"
&& [db_string check_base_tables {select 1 from pg_class where relname = 'apm_package_versions'} -default 0]
@@ -1338,7 +1338,7 @@
# Caching
#####################################################
- if {[info commands ::ns_cache_names] ne ""} {
+ if {[namespace which ::ns_cache_names] ne ""} {
set createCache [expr {"site_nodes_cache" ni [::ns_cache_names]}]
} else {
set createCache [catch {ns_cache flush site_nodes_cache NOTHING}]
@@ -1672,7 +1672,7 @@
}
site_node object mixins add SiteNodesCache
- if {[info commands ns_urlspace] ne ""} {
+ if {[namespace which ns_urlspace] ne ""} {
set ::acs::siteNodesID [ns_urlspace new]
ns_log notice \
"... using ns_urlspace $::acs::siteNodesID for reduced redundancy in site node caches"
@@ -1775,7 +1775,7 @@
# interface might not be initialized yet. However, in this
# situation, there is nothing to flush yet.
#
- if {[info commands ::xo::db::sql::site_node] ne ""} {
+ if {[namespace which ::xo::db::sql::site_node] ne ""} {
#ns_log notice "call [list ::xo::site_node flush_cache -node_id $root_node_id]"
::xo::site_node flush_cache -node_id $root_node_id
}
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.109.2.17 -r1.109.2.18
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 17 Oct 2020 18:19:33 -0000 1.109.2.17
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 28 Oct 2020 15:39:19 -0000 1.109.2.18
@@ -2009,7 +2009,7 @@
#
####################
-if {[info commands ns_reflow_text] eq ""} {
+if {[namespace which ns_reflow_text] eq ""} {
#
# Define compatibility function for those implementations, that do
# not have the built-in version of NaviServer
@@ -2256,7 +2256,7 @@
#
# Try syntax highlighting just when target is text/html
#
- if {[info commands ::Markdown::register] ne ""} {
+ if {[namespace which ::Markdown::register] ne ""} {
#
# We can register a converter
#
@@ -2265,7 +2265,7 @@
set text [Markdown::convert $text]
- if {[info commands ::Markdown::get_lang_counter] ne ""} {
+ if {[namespace which ::Markdown::get_lang_counter] ne ""} {
set d [::Markdown::get_lang_counter]
if {$d ne ""} {
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.69 -r1.189.2.70
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 8 Oct 2020 16:56:47 -0000 1.189.2.69
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Oct 2020 15:39:19 -0000 1.189.2.70
@@ -1399,7 +1399,7 @@
# In case there are temporary XOTcl objects, clean these up to
# avoid surprises in schedued threads about pre-existing objects.
#
- if {[info commands ::xo::at_cleanup] ne ""} {
+ if {[namespace which ::xo::at_cleanup] ne ""} {
::xo::at_cleanup
}
}
Index: openacs-4/packages/acs-tcl/tcl/xml-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-2-procs.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-tcl/tcl/xml-2-procs.tcl 4 Aug 2020 09:35:16 -0000 1.5.2.1
+++ openacs-4/packages/acs-tcl/tcl/xml-2-procs.tcl 28 Oct 2020 15:39:19 -0000 1.5.2.2
@@ -114,7 +114,7 @@
set name parser[incr ParserCounter]
}
- if {[info commands [namespace current]::$name] ne {}} {
+ if {[namespace which [namespace current]::$name] ne {}} {
return -code error "unable to create parser object \"[namespace current]::$name\" command"
}
Index: openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl 17 Dec 2019 17:02:06 -0000 1.4.2.3
+++ openacs-4/packages/acs-templating/tcl/0-acs-templating-procs.tcl 28 Oct 2020 15:39:19 -0000 1.4.2.4
@@ -38,7 +38,7 @@
# (if the proc doesn't exist).
# This makes debugging templating tags so much easier, because you don't have
# to restart the server each time.
- set exists_p [llength [info commands template_tag_$name]]
+ set exists_p [expr {[namespace which template_tag_$name] ne {}}]
switch [llength $arglist] {
Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v
diff -u -r1.23.2.6 -r1.23.2.7
--- openacs-4/packages/acs-templating/tcl/data-procs.tcl 3 Jul 2020 07:27:29 -0000 1.23.2.6
+++ openacs-4/packages/acs-templating/tcl/data-procs.tcl 28 Oct 2020 15:39:19 -0000 1.23.2.7
@@ -439,7 +439,7 @@
@param type The data type to be transformed.
} {
- set proc_name [info commands ::template::data::transform::$type]
+ set proc_name [namespace which ::template::data::transform::$type]
if { $proc_name ne {} } {
transform::$type $value_ref
}
Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -r1.37.2.8 -r1.37.2.9
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl 19 Dec 2019 20:01:02 -0000 1.37.2.8
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl 28 Oct 2020 15:39:19 -0000 1.37.2.9
@@ -615,7 +615,7 @@
set transform_proc "::template::data::transform::$datatype"
- if {[info commands $transform_proc] eq ""} {
+ if {[namespace which $transform_proc] eq ""} {
set values [ns_querygetall $element(id)]
Index: openacs-4/packages/acs-templating/tcl/head-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-init.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/acs-templating/tcl/head-init.tcl 22 May 2019 09:21:54 -0000 1.1.2.2
+++ openacs-4/packages/acs-templating/tcl/head-init.tcl 28 Oct 2020 15:39:19 -0000 1.1.2.3
@@ -7,7 +7,7 @@
#
# Gustaf Neumann, March 2019
#
-if {[info commands ns_writer] ne ""} {
+if {[namespace which ns_writer] ne ""} {
ns_register_proc GET __urn/* {
set URN [string range [ns_conn url] 7 end]
ns_log notice "URN handler checks URN <$URN>"
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -r1.65.2.6 -r1.65.2.7
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 3 Jul 2020 07:27:29 -0000 1.65.2.6
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 28 Oct 2020 15:39:19 -0000 1.65.2.7
@@ -129,7 +129,7 @@
set templated_p 1
}
- if { [info commands ::ds_page_fragment_cache_enabled_p] ne ""
+ if { [namespace which ::ds_page_fragment_cache_enabled_p] ne ""
&& [::ds_enabled_p]
&& [::ds_page_fragment_cache_enabled_p]
&& [::ds_collection_enabled_p] } {
@@ -147,7 +147,7 @@
template::code::${template_extension}::$__adp_stub
# JCD: Lets keep a copy of all the page fragments! WooHoo.
- if { [info commands ::ds_page_fragment_cache_enabled_p] ne ""
+ if { [namespace which ::ds_page_fragment_cache_enabled_p] ne ""
&& [::ds_enabled_p]
&& [::ds_page_fragment_cache_enabled_p]
&& [::ds_collection_enabled_p] } {
@@ -374,7 +374,7 @@
to the .adp or .tcl file to source.
} {
# this will return the name of the proc if it exists
- set proc_name [info commands ::template::mtimes::${type}::$file_stub]
+ set proc_name [namespace which ::template::mtimes::${type}::$file_stub]
set pkg_id [apm_package_id_from_key acs-templating]
set refresh_cache [parameter::get -package_id $pkg_id -parameter RefreshCache -default "as needed"]
@@ -404,7 +404,7 @@
# Here we add profiling calls if developer support exists on the
# system.
- if {[info commands ::ds_enabled_p] ne ""} {
+ if {[namespace which ::ds_enabled_p] ne ""} {
proc ::template::code::${type}::$file_stub {} "if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\] && \[::ds_profiling_enabled_p\]} { ds_profile start $file_stub.$type }
uplevel {
$code
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.66.2.5 -r1.66.2.6
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 28 Sep 2020 21:04:04 -0000 1.66.2.5
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 28 Oct 2020 15:39:19 -0000 1.66.2.6
@@ -253,7 +253,8 @@
} {
set tag textarea
if {[dict exists $options editor]
- && [info commands ::richtext::[dict get $options editor]::get_tag] ne ""
+ && [namespace which ::richtext::[
+ dict get $options editor]::get_tag] ne ""
} {
set tag [::richtext::[dict get $options editor]::get_tag -options $options]
}
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.49.2.4 -r1.49.2.5
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl 17 Dec 2019 17:01:20 -0000 1.49.2.4
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl 28 Oct 2020 15:39:19 -0000 1.49.2.5
@@ -81,7 +81,9 @@
template::tag slave { params } {
#Start developer support frame around subordinate template.
- if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne "" } {
+ if { [namespace which ::ds_enabled_p] ne ""
+ && [namespace which ::ds_adp_start_box] ne "" } {
+
::ds_adp_start_box
}
@@ -92,7 +94,9 @@
}
#End developer support frame around subordinate template.
- if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_end_box] ne "" } {
+ if { [namespace which ::ds_enabled_p] ne ""
+ && [namespace which ::ds_adp_end_box] ne "" } {
+
::ds_adp_end_box
}
@@ -198,20 +202,20 @@
set src [ns_set iget $params src]
set ds [ns_set iget $params ds]
if {$ds eq ""} {set ds 1}
- set ds_avail_p [expr {[info commands ::ds_adp_start_box] ne "" }]
+ set ds_avail_p [expr {[namespace which ::ds_adp_start_box] ne "" }]
#Start developer support frame around subordinate template.
- if { $ds && [info commands ::ds_enabled_p] ne "" && $ds_avail_p } {
+ if { $ds && [namespace which ::ds_enabled_p] ne "" && $ds_avail_p } {
::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
}
template::adp_append_code [template::template_tag_include_helper_code \
- -ds_avail_p [expr {[info commands ::ds_adp_start_box] ne "" }] \
+ -ds_avail_p [expr {[namespace which ::ds_adp_start_box] ne "" }] \
-src $src \
-command [template::template_tag_include_command $src $params]]
# End developer support frame around subordinate template.
- if { $ds && [info commands ::ds_enabled_p] ne "" && $ds_avail_p } {
+ if { $ds && [namespace which ::ds_enabled_p] ne "" && $ds_avail_p } {
::ds_adp_end_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
}
}
@@ -736,7 +740,9 @@
if {$ds eq ""} {set ds 1}
#Start developer support frame around subordinate template.
- if { $ds && [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_start_box] ne ""} {
+ if { $ds && [namespace which ::ds_enabled_p] ne ""
+ && [namespace which ::ds_adp_start_box] ne ""} {
+
::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
}
@@ -762,8 +768,10 @@
"
#End developer support frame around subordinate template.
- if { $ds && [info commands ::ds_enabled_p] ne "" && [info commands ::ds_adp_end_box] ne "" } {
- ::ds_adp_end_box -stub [subst -nocmmands {[template::util::url_to_file "$src" "\$__adp_stub"]}]
+ if { $ds && [namespace which ::ds_enabled_p] ne ""
+ && [namespace which ::ds_adp_end_box] ne "" } {
+ ::ds_adp_end_box -stub [
+ subst -nocommands {[template::util::url_to_file "$src" "\$__adp_stub"]}]
}
}