--- loncom/cgi/userstatus.pl	2003/08/27 18:20:11	1.5
+++ loncom/cgi/userstatus.pl	2003/10/30 22:52:25	1.8
@@ -1,11 +1,31 @@
 #!/usr/bin/perl
 $|=1;
-# The LearningOnline Network with CAPA
 # User Status
-# (Versions
-# (Running loncron
-# 09/06/01 Gerd Kortemeyer)
-# 02/18/02,02/19/02 Gerd Kortemeyer)
+# $Id: userstatus.pl,v 1.8 2003/10/30 22:52:25 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 
 use strict;
 use lib '/home/httpd/lib/perl/';
@@ -30,7 +50,7 @@ sub analyze_time {
     my $userclass=$actl[0];
     if ($since>300) { $color="#222222"; }
     if ($since>600) { $color="#444444"; }
-    if ($since>3600) { $color="#666666"; $userclass=$actl[1]; }
+    if ($since>1800) { $color="#666666"; $userclass=$actl[1]; }
     if ($since>7200) { $color="#888888"; }
     if ($since>21600) { $color="#AAAAAA"; $userclass=$actl[2]; }
     return ($color,$userclass);
@@ -129,8 +149,16 @@ sub main {
 	print "<b>Load Average:<b> ".$loadavg;
 	print "</body></html>";
     } else {
-	foreach (sort keys %usercount) {
-	    print $_.'='.$usercount{$_}.'&';
+	foreach my $l1 (sort keys %usercount) {
+	    foreach my $l2 (sort keys %{$usercount{$l1}}) {
+		foreach my $l3 (sort keys %{$usercount{$l1}{$l2}}) {
+		    print $l1.'_'.$l2.'_'.$l3.'='.$usercount{$l1}{$l2}{$l3}.'&';
+		}
+	    }
+	}
+	#clusterstatus values
+	foreach my $act (@actl) {
+	    print "$act=".$usercount{'Overall'}{'all'}{$act}.'&';
 	}
 	print 'loadavg='.$loadavg;
     }