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.4 -r1.5
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	12 Dec 2006 18:52:19 -0000	1.4
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	12 Dec 2006 20:07:12 -0000	1.5
@@ -389,6 +389,18 @@
   } {
     return [my array size pa]
   }
+
+  Users ad_proc nr_users_time_window {} {
+    @return number of different ip addresses and authenticated users (in time window)
+  } {
+    set ip 0; set auth 0
+    foreach i [my array names pa] {
+      if {[string match *.* $i]} {incr ip} {incr auth}
+    }
+    return [list $ip $auth]
+  }
+
+
   Users ad_proc hits {uid} {
     @param uid request key
     @return Number of hits by this user (in time window)
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.7 -r1.8
--- openacs-4/packages/xotcl-request-monitor/www/index.tcl	12 Dec 2006 18:52:20 -0000	1.7
+++ openacs-4/packages/xotcl-request-monitor/www/index.tcl	12 Dec 2006 20:07:12 -0000	1.8
@@ -256,6 +256,9 @@
 
 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 activeIP10      [lindex $active10 0]
 set active24        [throttle users perDay]
 set activeUsers24   [lindex $active24 1]
 set activeIP24      [lindex $active24 0]
@@ -268,7 +271,7 @@
   set active_community_string ""
 }
 
-set active_user_string "<A href='./whos-online'>$active_users_10 users</a> $active_community_string active in last 10 minutes, $activeUsers24 in last $::server_running ($activeTotal24 total)"
+set active_user_string "<A href='./whos-online'>$active_users_10 users ($activeUsers10 + $activeIP10)</a> $active_community_string active in last 10 minutes, $activeTotal24 ($activeUsers24 + $activeIP24) in last $::server_running"
 set jsGraph [expr {!$jsGraph}]
 set toggle_graphics_url [export_vars -base [ad_conn url] {jsGraph}]
 set jsGraph [expr {!$jsGraph}]