--- loncom/cgi/userstatus.pl	2003/10/30 22:52:25	1.8
+++ loncom/cgi/userstatus.pl	2007/10/02 01:36:31	1.16
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 $|=1;
 # User Status
-# $Id: userstatus.pl,v 1.8 2003/10/30 22:52:25 albertel Exp $
+# $Id: userstatus.pl,v 1.16 2007/10/02 01:36:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,9 +30,9 @@ $|=1;
 use strict;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
-
+use LONCAPA;
 use HTTP::Headers;
-use IO::File;
+use GDBM_File;
 
 
 my %usercount;
@@ -48,9 +48,9 @@ sub analyze_time {
     my ($since)=@_;
     my $color="#000000";
     my $userclass=$actl[0];
-    if ($since>300) { $color="#222222"; }
+    if ($since>300) { $color="#222222"; $userclass=$actl[1]; }
     if ($since>600) { $color="#444444"; }
-    if ($since>1800) { $color="#666666"; $userclass=$actl[1]; }
+    if ($since>1800) { $color="#666666"; }
     if ($since>7200) { $color="#888888"; }
     if ($since>21600) { $color="#AAAAAA"; $userclass=$actl[2]; }
     return ($color,$userclass);
@@ -78,8 +78,10 @@ sub main {
 
     opendir(DIR,$$perlvar{'lonIDsDir'});
     my @allfiles=(sort(readdir(DIR)));
+    my %users;
     foreach my $filename (@allfiles) {
 	if ($filename=~/^\./) { next; }
+	if ($filename=~/^publicuser_/) { next; }
 	my ($dev,$ino,$mode,$nlink,
 	    $uid,$gid,$rdev,$size,
 	    $atime,$mtime,$ctime,
@@ -87,52 +89,74 @@ sub main {
 	my $now=time;
 	my $since=$now-$mtime;
 	my $sinceacc=$now-$atime;
-	unless ($oneline || $justsummary) { print ("\n\n<hr />"); }
+	#unless ($oneline || $justsummary) { print ("\n\n<hr />"); }
 	my %userinfo;
-	my $fh=IO::File->new($$perlvar{'lonIDsDir'}.'/'.$filename);
-	while (my $line=<$fh>) {
-	    chomp($line);
-	    my ($name,$value)=split(/\=/,$line);
-	    $userinfo{$name}=$value;
-	}
-	$fh->close();
+	($userinfo{'user.name'},undef,$userinfo{'user.domain'})=
+	    split('_',$filename);
 	my ($color,$userclass)=&analyze_time($since);
 	&add_count('Overall','all',$userclass);
 	&add_count('Domain',$userinfo{'user.domain'},$userclass);
 	
 	unless ($oneline) {
+	    if (!tie(%userinfo,'GDBM_File',
+		     $$perlvar{'lonIDsDir'}.'/'.$filename,
+		     &GDBM_READER(),0640)) {
+		next;
+	    }
 	    if (!$justsummary) {
-		print '<font color="'.$color.'">';
-		print '<h3>'.$userinfo{'environment.lastname'}.', '.
+		$users{$userclass}{$filename} .=
+		    '<font color="'.$color.'">'.
+		    '<h3>'.$userinfo{'environment.lastname'}.', '.
 		    $userinfo{'environment.firstname'}.' '.
 		    $userinfo{'environment.middlename'}.' '.
 		    $userinfo{'environment.generation'}." (".
 		    $userinfo{'user.name'}."\@".$userinfo{'user.domain'}.
-		    ")</h3>\n<b>Login time:</b> ".
+		    ")</h3>\n".
+		    "<p><tt>$filename</tt></p>".
+		    "<b>Login time:</b> ".
 		    localtime($userinfo{'user.login.time'}).
-		    ' <b>Browser</b>: '.$userinfo{'browser.type'}." <b>Client:</b> ".
+		    ' <b>Browser</b>: '.$userinfo{'browser.type'}.
+		    " on ".$userinfo{'browser.os'}."<b>Client:</b> ".
 		    $userinfo{'request.host'}."<br />\n<b>Role: </b>".
 		    $userinfo{'request.role'}." ";
 	    }
 	    &add_count('Browser',$userinfo{'browser.type'},$userinfo{'browser.version'});
+	    &add_count('OS',$userinfo{'browser.os'},$userinfo{'browser.type'});
 	    if ($userinfo{'request.course.id'}) {
 		my $cid=$userinfo{'request.course.id'};
 		my $coursename= $userinfo{'course.'.$cid.'.description'}.
 		    ' ('.$cid.')';
-		if (!$justsummary) { print "<b>Course:</b> ".$coursename; }
+		if (!$justsummary) { 
+		    $users{$userclass}{$filename} .= 
+			"<b>Course:</b> ".$coursename; 
+		}
 		&add_count('Course',$coursename,$userclass);
 	    } else {
-		if (!$justsummary) { print "Not in a course."; }
+		if (!$justsummary) {
+		    $users{$userclass}{$filename} .= 
+			"Not in a course.";
+		}
 		&add_count('Course','No Course',$userclass);
 	    }
 	    if (!$justsummary) {
-		print "<br /><b>Last Transaction:</b> ".localtime($mtime).
+		$users{$userclass}{$filename} .=
+		    "<br /><b>Last Transaction:</b> ".localtime($mtime).
 		    " (".$since." secs ago) <br /><b>Last Access:</b> ".
-		    localtime($atime)." (".$sinceacc." secs ago)";
-		print ("</font>"); 
+		    localtime($atime)." (".$sinceacc." secs ago)".
+		    "</font>";
 	    }
 	}
+	untie(%userinfo);
     }
+    if (!$oneline && !$justsummary) {
+       	foreach my $class (@actl) {
+	    print("\n\n<hr /><h1>$class</h1>");    
+	    foreach my $filename (sort(keys(%{$users{$class}}))) {
+		print("\n\n".$users{$class}{$filename}."\n\n<hr />");    
+	    }
+	}
+    }
+
     closedir(DIR);
     open (LOADAVGH,"/proc/loadavg");
     my $loadavg=<LOADAVGH>;
@@ -144,6 +168,7 @@ sub main {
 	&showact('Domain',%usercount);
 	&showact('Course',%usercount);
 	&show('Browser',%usercount);
+	&show('OS',%usercount);
 
 #	print "\n</pre>";
 	print "<b>Load Average:<b> ".$loadavg;