Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.284.2.21 -r1.284.2.22 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 23 Jul 2019 14:14:59 -0000 1.284.2.21 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 23 Jul 2019 14:36:00 -0000 1.284.2.22 @@ -733,7 +733,7 @@ # Search for the slot. If the slot exists, extend its default # value with the new value foreach c [:info heritage] { - if {[info commands ${c}::slot::$name] ne ""} { + if {[nsf::is object ${c}::slot::$name]} { set value [list $value {*}[${c}::slot::$name default]] break } Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.542.2.33 -r1.542.2.34 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 23 Jul 2019 14:15:00 -0000 1.542.2.33 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 23 Jul 2019 14:36:01 -0000 1.542.2.34 @@ -1375,7 +1375,7 @@ # # Make sure, the page_template is instantiated # - if {[info commands ::${:page_template}] eq ""} { + if {![nsf::is object ::${:page_template}]} { ::xo::db::CrClass get_instance_from_db -item_id ${:page_template} } return [expr {[${:page_template} name] eq "en:link.form"}] Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.368.2.28 -r1.368.2.29 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 23 Jul 2019 14:15:00 -0000 1.368.2.28 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 23 Jul 2019 14:36:01 -0000 1.368.2.29 @@ -467,7 +467,7 @@ error "cannot lookup page $formName" } ::xo::db::CrClass get_instance_from_db -item_id $item_id - if {[info commands ::$item_id] eq "" + if {![nsf::is object ::$item_id] || "::xowiki::PageTemplate" ni [::$item_id info precedence]} { error "OK $formName is not suited to be used as template. Should be a Form!" } 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.5 -r1.67.2.6 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 15 Jul 2019 18:45:22 -0000 1.67.2.5 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 23 Jul 2019 14:38:03 -0000 1.67.2.6 @@ -871,7 +871,7 @@ if {$mkey ne ${:last_mkey}} { if {${:last_mkey} ne ""} {:purge_access_stats} # create or recreate the container object for that minute - if {[:isobject $obj]} { + if {[nsf::is object $obj]} { $obj destroy } Users create $obj -point_in_time $now @@ -1369,7 +1369,11 @@ } else { file delete -force ${:file} set dumpFile [AsyncLogFile new -filename ${:file}] - $dumpFile write $cmd + # Split the cmd to avoid sanitizer without the need to check, if + # the server has support + foreach l [split $cmd \n] { + $dumpFile write $l + } $dumpFile destroy } } @@ -1425,7 +1429,7 @@ while {-1 != [gets $f line]} { regexp {(.*) -- (.*) ::(.*) (.*)} $line match timestamp server counter value #ns_log notice "$counter add_value $timestamp $value" - if {[::xotcl::Object isobject $counter]} { + if {[nsf::is object $counter]} { $counter add_value $timestamp $value } elseif {![info exists complain($counter)]} { ns_log notice "request-monitor: ignore reload of value $value for counter $counter"