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.41 -r1.41.2.1 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 29 Jul 2013 07:45:26 -0000 1.41 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 17 Sep 2013 19:29:57 -0000 1.41.2.1 @@ -219,7 +219,7 @@ if {[my exists active($requestKey)]} { # if more than one request for this key is already active, # return blocking time - foreach {to cnt} [my set active($requestKey)] break + lassign [my set active($requestKey)] to cnt set retMs [expr {$cnt>[my startThrottle] ? 500 : 0}] # cancel the timeout after cancel $to @@ -423,7 +423,7 @@ Counter user_count_day -timeoutMs [expr {60000*60}] -logging 1 user_count_day proc end {} { - foreach {auth ip} [throttle users nr_users_per_day] break + lassign [throttle users nr_users_per_day] auth ip set now [clock format [clock seconds]] # The counter logs its intrinsic value (c) anyhow, which are the # authenticated users. We also want to record the number of @@ -794,7 +794,7 @@ Users proc expSmooth {ts key} { set mins [expr {$ts/60}] if {[my exists expSmooth($key)]} { - foreach {_ aggval lastmins hits} [my set expSmooth($key)] break + lassign [my set expSmooth($key)] _ aggval lastmins hits set mindiff [expr {$mins-$lastmins}] if {$mindiff == 0} { incr hits Index: openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl 14 Dec 2005 16:09:02 -0000 1.1 +++ openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl 17 Sep 2013 19:29:57 -0000 1.1.2.1 @@ -20,7 +20,7 @@ Field count -label Count -orderby count } -foreach {att order} [split $orderby ,] break +lassign [split $orderby ,] att order t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att foreach {community_id users} [throttle users active_communities] { Index: openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl 12 Sep 2008 20:12:08 -0000 1.6 +++ openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl 17 Sep 2013 19:29:57 -0000 1.6.2.1 @@ -60,7 +60,7 @@ set hidden 0 foreach element [lsort -index 0 -decreasing $requests] { - foreach {timestamp url pa} $element break + lassign $element timestamp url pa if {!$all} { set exclude 0 foreach pattern $hide_patterns { Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/xotcl-request-monitor/www/last100.tcl 12 Sep 2008 20:12:08 -0000 1.6 +++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl 17 Sep 2013 19:29:57 -0000 1.6.2.1 @@ -32,11 +32,11 @@ AnchorField url -label "URL" -orderby url } -foreach {att order} [split $orderby ,] break +lassign [split $orderby ,] att order t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att foreach l $stat { - foreach {timestamp c url ms requestor} $l break + lassign $l timestamp c url ms requestor if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" Index: openacs-4/packages/xotcl-request-monitor/www/last101.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last101.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/xotcl-request-monitor/www/last101.tcl 12 Sep 2008 20:12:08 -0000 1.2 +++ openacs-4/packages/xotcl-request-monitor/www/last101.tcl 17 Sep 2013 19:29:57 -0000 1.2.2.1 @@ -32,11 +32,11 @@ Field url -label "URL" -orderby url } -foreach {att order} [split $orderby ,] break +lassign [split $orderby ,] att order t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att foreach l $stat { - foreach {timestamp c url ms requestor} $l break + lassign $l timestamp c url ms requestor if {[string is integer $requestor]} { acs_user::get -user_id $requestor -array user set user_string "$user(first_names) $user(last_name)" Index: openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 30 Dec 2005 00:07:23 -0000 1.2 +++ openacs-4/packages/xotcl-request-monitor/www/throttle-statistics.tcl 17 Sep 2013 19:29:57 -0000 1.2.2.1 @@ -28,7 +28,7 @@ multirow create url_statistics type user user_url time IPadress URL foreach l [lsort -index 2 $data] { - foreach {type user time IPadress URL} $l break + lassign $l type user time IPadress URL if {[string match *.* $user]} { set user "Anonymous" set user_url "" Index: openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl 12 Sep 2008 20:12:08 -0000 1.2 +++ openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl 17 Sep 2013 19:29:57 -0000 1.2.2.1 @@ -24,7 +24,7 @@ foreach e [lsort -decreasing -index 0 \ [throttle users in_community $community_id]] { - foreach {timestamp requestor} $e break + lassign $e timestamp requestor if {[info exists listed($requestor)]} continue set listed($requestor) 1 if {[string is integer $requestor]} { Index: openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl 29 Dec 2008 14:20:08 -0000 1.3 +++ openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl 17 Sep 2013 19:29:57 -0000 1.3.2.1 @@ -38,14 +38,14 @@ set users [list] -foreach {ip auth} [throttle users users_per_day] break +lassign [throttle users users_per_day] ip auth if {!$all} {set elements [concat $ip $auth]} {set elements $auth} set summary "We noticed in [expr {[llength $ip]+[llength $auth]}] users in total, containing [llength $auth] authenticated users" set now_ansi [clock_to_ansi [clock seconds]] foreach element $elements { - foreach {user_id timestamp} $element break + lassign $element user_id timestamp if {[string is integer $user_id]} { acs_user::get -user_id $user_id -array user set user_label "$user(last_name), $user(first_names)" Index: openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl 4 Oct 2008 19:26:51 -0000 1.10 +++ openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl 17 Sep 2013 19:29:57 -0000 1.10.2.1 @@ -62,7 +62,7 @@ set users [list] foreach element [throttle users active -full] { - foreach {user_id pa timestamp hits smooth switches} $element break + lassign $element user_id pa timestamp hits smooth switches if {[string is integer $user_id]} { acs_user::get -user_id $user_id -array user set user_label "$user(last_name), $user(first_names)"