--- loncom/cgi/userstatus.pl	2003/10/30 22:52:25	1.8
+++ loncom/cgi/userstatus.pl	2006/06/02 21:36:21	1.13
@@ -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.13 2006/06/02 21:36:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@ $|=1;
 use strict;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
-
+use LONCAPA;
 use HTTP::Headers;
 use IO::File;
 
@@ -80,6 +80,7 @@ sub main {
     my @allfiles=(sort(readdir(DIR)));
     foreach my $filename (@allfiles) {
 	if ($filename=~/^\./) { next; }
+	if ($filename=~/^publicuser_/) { next; }
 	my ($dev,$ino,$mode,$nlink,
 	    $uid,$gid,$rdev,$size,
 	    $atime,$mtime,$ctime,
@@ -89,18 +90,22 @@ sub main {
 	my $sinceacc=$now-$atime;
 	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) {
+	    my $fh=IO::File->new($$perlvar{'lonIDsDir'}.'/'.$filename);
+	    while (my $line=<$fh>) {
+		chomp($line);
+		my ($name,$value)=split(/\=/,$line);
+		$name = &unescape($name);
+		$value = &unescape($value);
+		$userinfo{$name}=$value;
+	    }
+	    $fh->close();
 	    if (!$justsummary) {
 		print '<font color="'.$color.'">';
 		print '<h3>'.$userinfo{'environment.lastname'}.', '.
@@ -110,11 +115,13 @@ sub main {
 		    $userinfo{'user.name'}."\@".$userinfo{'user.domain'}.
 		    ")</h3>\n<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'}.
@@ -144,6 +151,7 @@ sub main {
 	&showact('Domain',%usercount);
 	&showact('Course',%usercount);
 	&show('Browser',%usercount);
+	&show('OS',%usercount);
 
 #	print "\n</pre>";
 	print "<b>Load Average:<b> ".$loadavg;