Index: openacs-4/packages/xotcl-request-monitor/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/xotcl-request-monitor/www/index.tcl 23 May 2008 19:23:24 -0000 1.12 +++ openacs-4/packages/xotcl-request-monitor/www/index.tcl 4 Oct 2008 19:26:51 -0000 1.13 @@ -263,15 +263,15 @@ } append current_system_activity \n[currentViews] -set active_users_10 [throttle users nr_active] set throttle_stats [throttle statistics] set active10 [throttle users nr_users_time_window] -set activeUsers10 [lindex $active10 1] +set authUsers10 [lindex $active10 1] set activeIP10 [lindex $active10 0] +set activeTotal10 [expr {$authUsers10 + $activeIP10}] set active24 [throttle users perDay] -set activeUsers24 [lindex $active24 1] +set authUsers24 [lindex $active24 1] set activeIP24 [lindex $active24 0] -set activeTotal24 [expr {$activeUsers24 + $activeIP24}] +set activeTotal24 [expr {$authUsers24 + $activeIP24}] if {[info command ::dotlrn_community::get_community_id] ne ""} { set nr [throttle users nr_active_communities] @@ -280,7 +280,7 @@ set active_community_string "" } -set active_user_string "$active_users_10 users ($activeUsers10 authenticated) $active_community_string active in last 10 minutes, $activeTotal24 ($activeUsers24 authenticated) in last $::server_running" +set active_user_string "$activeTotal10 users ($authUsers10 authenticated) $active_community_string active in last 10 minutes, $activeTotal24 ($authUsers24 authenticated) in last $::server_running" set jsGraph [expr {!$jsGraph}] set toggle_graphics_url [export_vars -base [ad_conn url] {jsGraph}] set jsGraph [expr {!$jsGraph}]