Diff for /loncom/cgi/userstatus.pl between versions 1.8 and 1.12

version 1.8, 2003/10/30 22:52:25 version 1.12, 2005/08/25 19:43:40
Line 80  sub main { Line 80  sub main {
     my @allfiles=(sort(readdir(DIR)));      my @allfiles=(sort(readdir(DIR)));
     foreach my $filename (@allfiles) {      foreach my $filename (@allfiles) {
  if ($filename=~/^\./) { next; }   if ($filename=~/^\./) { next; }
    if ($filename=~/^publicuser_/) { next; }
  my ($dev,$ino,$mode,$nlink,   my ($dev,$ino,$mode,$nlink,
     $uid,$gid,$rdev,$size,      $uid,$gid,$rdev,$size,
     $atime,$mtime,$ctime,      $atime,$mtime,$ctime,
Line 89  sub main { Line 90  sub main {
  my $sinceacc=$now-$atime;   my $sinceacc=$now-$atime;
  unless ($oneline || $justsummary) { print ("\n\n<hr />"); }   unless ($oneline || $justsummary) { print ("\n\n<hr />"); }
  my %userinfo;   my %userinfo;
  my $fh=IO::File->new($$perlvar{'lonIDsDir'}.'/'.$filename);   ($userinfo{'user.name'},undef,$userinfo{'user.domain'})=
  while (my $line=<$fh>) {      split('_',$filename);
     chomp($line);  
     my ($name,$value)=split(/\=/,$line);  
     $userinfo{$name}=$value;  
  }  
  $fh->close();  
  my ($color,$userclass)=&analyze_time($since);   my ($color,$userclass)=&analyze_time($since);
  &add_count('Overall','all',$userclass);   &add_count('Overall','all',$userclass);
  &add_count('Domain',$userinfo{'user.domain'},$userclass);   &add_count('Domain',$userinfo{'user.domain'},$userclass);
   
  unless ($oneline) {   unless ($oneline) {
       my $fh=IO::File->new($$perlvar{'lonIDsDir'}.'/'.$filename);
       while (my $line=<$fh>) {
    chomp($line);
    my ($name,$value)=split(/\=/,$line);
    $userinfo{$name}=$value;
       }
       $fh->close();
     if (!$justsummary) {      if (!$justsummary) {
  print '<font color="'.$color.'">';   print '<font color="'.$color.'">';
  print '<h3>'.$userinfo{'environment.lastname'}.', '.   print '<h3>'.$userinfo{'environment.lastname'}.', '.
Line 110  sub main { Line 113  sub main {
     $userinfo{'user.name'}."\@".$userinfo{'user.domain'}.      $userinfo{'user.name'}."\@".$userinfo{'user.domain'}.
     ")</h3>\n<b>Login time:</b> ".      ")</h3>\n<b>Login time:</b> ".
     localtime($userinfo{'user.login.time'}).      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.host'}."<br />\n<b>Role: </b>".
     $userinfo{'request.role'}." ";      $userinfo{'request.role'}." ";
     }      }
     &add_count('Browser',$userinfo{'browser.type'},$userinfo{'browser.version'});      &add_count('Browser',$userinfo{'browser.type'},$userinfo{'browser.version'});
       &add_count('OS',$userinfo{'browser.os'},$userinfo{'browser.type'});
     if ($userinfo{'request.course.id'}) {      if ($userinfo{'request.course.id'}) {
  my $cid=$userinfo{'request.course.id'};   my $cid=$userinfo{'request.course.id'};
  my $coursename= $userinfo{'course.'.$cid.'.description'}.   my $coursename= $userinfo{'course.'.$cid.'.description'}.
Line 144  sub main { Line 149  sub main {
  &showact('Domain',%usercount);   &showact('Domain',%usercount);
  &showact('Course',%usercount);   &showact('Course',%usercount);
  &show('Browser',%usercount);   &show('Browser',%usercount);
    &show('OS',%usercount);
   
 # print "\n</pre>";  # print "\n</pre>";
  print "<b>Load Average:<b> ".$loadavg;   print "<b>Load Average:<b> ".$loadavg;

Removed from v.1.8  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>