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.4 -r1.32.2.5 --- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 17 May 2019 14:11:14 -0000 1.32.2.4 +++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 11 Jun 2019 18:55:08 -0000 1.32.2.5 @@ -143,7 +143,7 @@ } # AOLserver must support ns_cache. -if {[llength [info commands ns_cache]] < 1} { +if {[info commands ns_cache] eq ""} { append errors "

  • The ns_cache module is not installed. This is required for OpenACS." set error_p 1 } 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 -r1.4.2.1 --- openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl 22 Dec 2017 14:14:20 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/10-charset-compat-procs.tcl 11 Jun 2019 18:55:08 -0000 1.4.2.1 @@ -1,18 +1,19 @@ ad_library { - + Compatibility procs in case we're not running a version of AOLServer that supports charsets. - + @author Rob Mayoff [mayoff@arsdigita.com] @author Nada Amin [namin@arsdigita.com] @creation-date June 28, 2000 @cvs-id $Id$ } -set compat_procs [list ns_startcontent ns_encodingfortype] - -foreach one_proc $compat_procs { - if {[llength [info commands $one_proc]] == 0} { - proc $one_proc {args} { } +# +# Define dummy stubs in case the required commands are not available. +# +foreach one_proc {ns_startcontent ns_encodingfortype} { + if {[info commands $one_proc] eq ""} { + proc $one_proc {args} { } } } 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.3 -r1.12.2.4 --- openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl 24 May 2019 15:44:01 -0000 1.12.2.3 +++ openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl 11 Jun 2019 18:55:08 -0000 1.12.2.4 @@ -23,9 +23,9 @@ set ok_p 1 - if {[llength [info commands tdom]] < 1} { - set xml_status_msg "tDOM is not installed! You must have tDOM installed, or nothing will work." - set ok_p 0 + if {[info commands ::tdom] eq ""} { + set xml_status_msg "tDOM is not installed! You must have tDOM installed, or nothing will work." + set ok_p 0 } return $ok_p @@ -46,10 +46,10 @@ @return parsed document object handle } { if {$persist_p} { - return [dom parse -simple $xml] + return [dom parse -simple $xml] } else { - dom parse -simple $xml doc - return $doc + dom parse -simple $xml doc + return $doc } } Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v diff -u -r1.28.2.8 -r1.28.2.9 --- openacs-4/packages/xowf/tcl/xowf-procs.tcl 11 Jun 2019 09:37:07 -0000 1.28.2.8 +++ openacs-4/packages/xowf/tcl/xowf-procs.tcl 11 Jun 2019 18:55:08 -0000 1.28.2.9 @@ -548,11 +548,11 @@ set ctx $obj-wfctx #:log "... ctx <$ctx> exists [:isobject $ctx]" - if {$new && [llength [info commands $ctx]] == 1} { + if {$new && [info commands $ctx] ne ""} { $ctx destroy } - if {[llength [info commands $ctx]] == 0} { + if {[info commands $ctx] eq ""} { set wfContextClass [$obj wf_property workflow_context_class [self]] regsub -all \r\n [$obj wf_property workflow_definition] \n workflow_definition @@ -710,7 +710,7 @@ append result " state_[$s name] \[label=\"[$s label]\"$color\];\n" } set initializeObj [:wf_definition_object initialize] - if {[llength [info commands $initializeObj]] > 0} { + if {[info commands $initializeObj] ne ""} { append result "start->state_initial \[label=\"[$initializeObj label]\"\];\n" } else { append result "start->state_initial;\n" @@ -807,7 +807,7 @@ if {![info exists :in_role]} { foreach role [array names :handled_roles] { set role_ctx [self]-$role - if {[llength [info commands $role_ctx]] > 0} { + if {[info commands $role_ctx] ne ""} { array set "" [$role_ctx check] if {$(rc) == 1} {return [array get ""]} array set :forms [$role_ctx array get forms] @@ -1415,9 +1415,13 @@ # Execute action and compute next state of the action. # set actionObj [$ctx wf_definition_object $action] - # Check, if action is defined - if {[llength [info commands $actionObj]] == 0} { - # no such action the current context + # + # Check, if action is defined. + # + if {[info commands $actionObj] eq ""} { + # + # There is no such action the current context. + # if {$verbose} {ns_log notice "Warning: ${:name} No action $action in workflow context"} return "" } 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.25 -r1.542.2.26 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 24 May 2019 17:44:09 -0000 1.542.2.25 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Jun 2019 18:55:08 -0000 1.542.2.26 @@ -1374,7 +1374,7 @@ # # Make sure, the page_template is instantiated # - if {[llength [info commands ${:page_template}]] == 0} { + if {[info commands ::${:page_template}] eq ""} { ::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.17 -r1.368.2.18 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 24 May 2019 17:44:09 -0000 1.368.2.17 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 11 Jun 2019 18:55:08 -0000 1.368.2.18 @@ -1124,7 +1124,7 @@ # # Build the input form and display the current values. # - + #:log "form_action is something different: <[:form_parameter __form_action {}]>" if {[:is_new_entry ${:name}]} { set :creator [::xo::get_user_name [::xo::cc user_id]] set :nls_language [ad_conn locale]