Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v diff -u -N -r1.13 -r1.13.4.1 --- openacs-4/packages/acs-developer-support/lib/toolbar.tcl 9 Jan 2010 01:56:09 -0000 1.13 +++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl 30 Sep 2013 11:09:26 -0000 1.13.4.1 @@ -20,22 +20,22 @@ multirow append ds_buttons USR \ "Toggle user switching" \ - [export_vars -base "${ds_url}set" { {field user} {enabled_p {[expr ![ds_user_switching_enabled_p]]}} {return_url [ad_return_url]} }] \ + [export_vars -base "${ds_url}set" { {field user} {enabled_p {[expr {![ds_user_switching_enabled_p]}] }} {return_url [ad_return_url]} }] \ [ad_decode [ds_user_switching_enabled_p] 1 "on" "off"] multirow append ds_buttons DB \ "Toggle DB data collection" \ - [export_vars -base "${ds_url}set" { {field db} {enabled_p {[expr ![ds_database_enabled_p]]}} {return_url [ad_return_url]} }] \ + [export_vars -base "${ds_url}set" { {field db} {enabled_p {[expr {![ds_database_enabled_p]}] }} {return_url [ad_return_url]} }] \ [ad_decode [ds_database_enabled_p] 1 "on" "off"] multirow append ds_buttons PRO \ "Toggle template profiling" \ - [export_vars -base "${ds_url}set" { {field prof} {enabled_p {[expr ![ds_profiling_enabled_p]]}} {return_url [ad_return_url]} }] \ + [export_vars -base "${ds_url}set" { {field prof} {enabled_p {[expr {![ds_profiling_enabled_p]}] }} {return_url [ad_return_url]} }] \ [ad_decode [ds_profiling_enabled_p] 1 "on" "off"] multirow append ds_buttons FRG \ "Toggle caching page fragments" \ - [export_vars -base "${ds_url}set" { {field frag} {enabled_p {[expr ![ds_page_fragment_cache_enabled_p]]}} {return_url [ad_return_url]} }] \ + [export_vars -base "${ds_url}set" { {field frag} {enabled_p {[expr {![ds_page_fragment_cache_enabled_p]}] }} {return_url [ad_return_url]} }] \ [ad_decode [ds_page_fragment_cache_enabled_p] 1 "on" "off"] multirow append ds_buttons TRN \ @@ -69,10 +69,10 @@ set flush_url [export_vars -base "[ad_url]/acs-admin/cache/flush-cache" { { suffix util_memoize } { return_url [ad_return_url] } }] - if { [empty_string_p $page_ms] } { + if { $page_ms eq "" } { set request_info_label "Request info" } else { - if { [empty_string_p $db_num_ms] } { + if { $db_num_ms eq "" } { set request_info_label "$page_ms ms" } else { set request_info_label "${page_ms} ms/${db_num_cmds} db/${db_num_ms} ms" Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl,v diff -u -N -r1.8 -r1.8.4.1 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl 9 Jan 2010 01:56:09 -0000 1.8 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl 30 Sep 2013 11:09:27 -0000 1.8.4.1 @@ -15,11 +15,11 @@ # Take the IP list (space or comma seperated) and turn it into a tcl list. set IPs [list] foreach ip [lsort -unique [split [parameter::get -package_id [ds_instance_id] -parameter EnabledIPs -default *] { ,}]] { - if {[string equal $ip "*"]} { + if {$ip eq "*"} { # a star means anything will match so just use the * instead set IPs "*" break - } elseif {![empty_string_p $ip]} { + } elseif {$ip ne ""} { lappend IPs $ip } } 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 -N -r1.52.2.8 -r1.52.2.9 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 9 Sep 2013 16:44:18 -0000 1.52.2.8 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 30 Sep 2013 11:09:27 -0000 1.52.2.9 @@ -668,7 +668,7 @@ if { [info exists ::ds_profile__start_clock($tag)] && $::ds_profile__start_clock($tag) ne "" } { ds_add prof $tag \ - [expr [clock clicks -milliseconds] - $::ds_profile__start_clock($tag)] + [expr {[clock clicks -milliseconds] - $::ds_profile__start_clock($tag)}] unset ::ds_profile__start_clock($tag) } else { ns_log Warning "ds_profile stop called without a corresponding call to ds_profile start, with tag $tag" Index: openacs-4/packages/acs-developer-support/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v diff -u -N -r1.20 -r1.20.2.1 --- openacs-4/packages/acs-developer-support/www/index.tcl 8 Dec 2012 18:20:36 -0000 1.20 +++ openacs-4/packages/acs-developer-support/www/index.tcl 30 Sep 2013 11:09:27 -0000 1.20.2.1 @@ -157,7 +157,7 @@ set url {} } - if { [info exists conn(query)] && ![empty_string_p $conn(query)] } { + if { [info exists conn(query)] && $conn(query) ne "" } { if { [string length $conn(query)] > 50 } { set query "?[string range $conn(query) 0 46]..." } else { Index: openacs-4/packages/acs-developer-support/www/request-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.tcl,v diff -u -N -r1.18 -r1.18.2.1 --- openacs-4/packages/acs-developer-support/www/request-info.tcl 6 Dec 2010 15:18:01 -0000 1.18 +++ openacs-4/packages/acs-developer-support/www/request-info.tcl 30 Sep 2013 11:09:27 -0000 1.18.2.1 @@ -110,7 +110,7 @@ set duration "[format "%.1f" [expr { ($endclicks - $startclicks) }]] ms" - if { [string equal $kind debug] && !$rp_show_debug_p } { + if { $kind eq "debug" && !$rp_show_debug_p } { continue } @@ -126,7 +126,7 @@ set from [lindex $info 1] set to [lindex $info 2] # unlist $info proc from to - if { [empty_string_p $to] } { + if { $to eq "" } { set to "?" } append body "Applied transformation from $from -> $to - $duration\n" @@ -139,25 +139,25 @@ set args [lindex $info 5] append body "Applied $kind filter: $proc [ns_quotehtml $args] (for $method $path) - $duration\n" - if { [string equal $action "error"] } { + if {$action eq "error"} { append body "\n" - } elseif { ![empty_string_p $action] } { + } elseif { $action ne "" } { append body "\n" } } registered_proc { set proc [lindex $info 2] set args [lindex $info 3] append body "Called registered procedure: $proc [ns_quotehtml $args] for ($method $path) - $duration\n" - if { [string equal $action "error"] } { + if {$action eq "error"} { append body "\n" } } serve_file { set file [lindex $info 0] set handler [lindex $info 1] append body "Served file $file with $handler - $duration\n" - if { [string equal $action "error"] } { + if {$action eq "error"} { append body "\n" } } @@ -211,21 +211,21 @@ foreach { handle command statement_name sql start end errno return } $property(db) { - if { ![empty_string_p $handle] && [info exists pool($handle)] } { + if { $handle ne "" && [info exists pool($handle)] } { set statement_pool $pool($handle) } else { set statement_pool "" } - if { $command == "gethandle" } { + if { $command eq "gethandle" } { # Remember which handle was acquired from which pool. set statement_pool $sql set value "gethandle (returned $return)" set pool($return) $sql - } elseif { $command == "releasehandle" } { + } elseif { $command eq "releasehandle" } { set value "releasehandle $handle" } else { - if { [empty_string_p $statement_name] } { + if { $statement_name eq "" } { set value "" } else { set value "$statement_name: " @@ -237,7 +237,7 @@ set len [string length $line] set trimleft_len [string length [string trimleft $line]] if { $trimleft_len > 0 } { - set whitespace [expr $len - $trimleft_len] + set whitespace [expr {$len - $trimleft_len}] if { $min_whitespace == -1 || $whitespace < $min_whitespace } { set min_whitespace $whitespace } @@ -255,7 +255,7 @@ append value "$command $statement_pool $handle
[ns_quotehtml $sql]
" } - if { ![string equal $command "getrow"] || [template::util::is_true $getrow_p] } { + if { $command ne "getrow" || [template::util::is_true $getrow_p] } { multirow append dbreqs $handle $command $sql [expr { $end - $start }] $value } Index: openacs-4/packages/acs-developer-support/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/acs-developer-support/www/search.tcl 5 Dec 2010 13:45:21 -0000 1.3 +++ openacs-4/packages/acs-developer-support/www/search.tcl 30 Sep 2013 11:09:27 -0000 1.3.2.1 @@ -28,7 +28,7 @@ append file_links " c" append file_links " o" set size [string length $content] - set highlight "...[ad_quotehtml [string trimleft [string range $content [expr [lindex $offset 0] - 50] [expr [lindex $offset 0] - 1]]]][ad_quotehtml [string range $content [lindex $offset 0] [lindex $offset 1]]][ad_quotehtml [string trimright [string range $content [expr [lindex $offset 1] + 1] [expr [lindex $offset 1] + 50]]]]..." + set highlight "...[ad_quotehtml [string trimleft [string range $content [expr {[lindex $offset 0] - 50}] [expr {[lindex $offset 0] - 1}]]]][ad_quotehtml [string range $content [lindex $offset 0] [lindex $offset 1]]][ad_quotehtml [string trimright [string range $content [expr {[lindex $offset 1] + 1}] [expr {[lindex $offset 1] + 50}]]]]..." multirow append matches $page $highlight $file_links $size } Index: openacs-4/packages/acs-developer-support/www/send.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/send.tcl,v diff -u -N -r1.4 -r1.4.14.1 --- openacs-4/packages/acs-developer-support/www/send.tcl 26 Apr 2005 14:57:57 -0000 1.4 +++ openacs-4/packages/acs-developer-support/www/send.tcl 30 Sep 2013 11:09:27 -0000 1.4.14.1 @@ -7,15 +7,15 @@ } ds_require_permission [ad_conn package_id] "admin" -if {![empty_string_p $code]} { +if {$code ne ""} { if {[regexp {(.*)\.(adp)} $code match stub ext]} { ns_return 200 text/plain [info body ::template::code::${ext}::$stub] } else { ns_returnfile 200 text/plain $code } -} elseif {![empty_string_p $fname]} { +} elseif {$fname ne ""} { ns_return 200 application/x-editlocal [ns_set get [ns_conn form] fname] -} elseif {![empty_string_p $output]} { +} elseif {$output ne ""} { if {[regexp {[0-9]+:error} $output]} { if {[ns_cache get ds_page_bits $output content]} { foreach error $content { Index: openacs-4/packages/acs-developer-support/www/shell.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/shell.tcl,v diff -u -N -r1.6 -r1.6.10.1 --- openacs-4/packages/acs-developer-support/www/shell.tcl 11 Oct 2006 16:24:11 -0000 1.6 +++ openacs-4/packages/acs-developer-support/www/shell.tcl 30 Sep 2013 11:09:27 -0000 1.6.10.1 @@ -25,7 +25,7 @@ {html {cols 80 rows 10}} } } -on_submit { - if { ![string equal POST [ns_conn method]] } { + if { "POST" ne [ns_conn method] } { set out "You cannot use GET to invoke a script on this page.\nClick OK to resubmit the form as a POST." } else { if {[catch {set out [uplevel 1 [string map {"\\\r\n" " "} $script]]}]} {