--- loncom/cgi/userstatus.pl 2004/01/14 01:39:14 1.9
+++ 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.9 2004/01/14 01:39:14 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
"); }
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 '';
print ''.$userinfo{'environment.lastname'}.', '.
@@ -116,7 +121,7 @@ sub main {
$userinfo{'request.role'}." ";
}
&add_count('Browser',$userinfo{'browser.type'},$userinfo{'browser.version'});
- &add_count('OS',$userinfo{'browser.os'});
+ &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'}.