[BACK]Return to userstatus.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / cgi

Diff for /loncom/cgi/userstatus.pl between versions 1.13 and 1.14

version 1.13, 2006/06/02 21:36:21 version 1.14, 2006/09/01 10:54:08
Line 48  sub analyze_time { Line 48  sub analyze_time {
     my ($since)=@_;      my ($since)=@_;
     my $color="#000000";      my $color="#000000";
     my $userclass=$actl[0];      my $userclass=$actl[0];
     if ($since>300) { $color="#222222"; }      if ($since>300) { $color="#222222"; $userclass=$actl[1]; }
     if ($since>600) { $color="#444444"; }      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>7200) { $color="#888888"; }
     if ($since>21600) { $color="#AAAAAA"; $userclass=$actl[2]; }      if ($since>21600) { $color="#AAAAAA"; $userclass=$actl[2]; }
     return ($color,$userclass);      return ($color,$userclass);
Line 78  sub main { Line 78  sub main {
   
     opendir(DIR,$$perlvar{'lonIDsDir'});      opendir(DIR,$$perlvar{'lonIDsDir'});
     my @allfiles=(sort(readdir(DIR)));      my @allfiles=(sort(readdir(DIR)));
       my %users;
     foreach my $filename (@allfiles) {      foreach my $filename (@allfiles) {
  if ($filename=~/^\./) { next; }   if ($filename=~/^\./) { next; }
  if ($filename=~/^publicuser_/) { next; }   if ($filename=~/^publicuser_/) { next; }
Line 88  sub main { Line 89  sub main {
  my $now=time;   my $now=time;
  my $since=$now-$mtime;   my $since=$now-$mtime;
  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;
  ($userinfo{'user.name'},undef,$userinfo{'user.domain'})=   ($userinfo{'user.name'},undef,$userinfo{'user.domain'})=
     split('_',$filename);      split('_',$filename);
Line 107  sub main { Line 108  sub main {
     }      }
     $fh->close();      $fh->close();
     if (!$justsummary) {      if (!$justsummary) {
  print '<font color="'.$color.'">';   $users{$userclass}{$filename} .=
  print '<h3>'.$userinfo{'environment.lastname'}.', '.      '<font color="'.$color.'">'.
       '<h3>'.$userinfo{'environment.lastname'}.', '.
     $userinfo{'environment.firstname'}.' '.      $userinfo{'environment.firstname'}.' '.
     $userinfo{'environment.middlename'}.' '.      $userinfo{'environment.middlename'}.' '.
     $userinfo{'environment.generation'}." (".      $userinfo{'environment.generation'}." (".
Line 126  sub main { Line 128  sub main {
  my $cid=$userinfo{'request.course.id'};   my $cid=$userinfo{'request.course.id'};
  my $coursename= $userinfo{'course.'.$cid.'.description'}.   my $coursename= $userinfo{'course.'.$cid.'.description'}.
     ' ('.$cid.')';      ' ('.$cid.')';
  if (!$justsummary) { print "<b>Course:</b> ".$coursename; }   if (!$justsummary) { 
       $users{$userclass}{$filename} .= 
    "<b>Course:</b> ".$coursename; 
    }
  &add_count('Course',$coursename,$userclass);   &add_count('Course',$coursename,$userclass);
     } else {      } else {
  if (!$justsummary) { print "Not in a course."; }   if (!$justsummary) {
       $users{$userclass}{$filename} .= 
    "Not in a course.";
    }
  &add_count('Course','No Course',$userclass);   &add_count('Course','No Course',$userclass);
     }      }
     if (!$justsummary) {      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> ".      " (".$since." secs ago) <br /><b>Last Access:</b> ".
     localtime($atime)." (".$sinceacc." secs ago)";      localtime($atime)." (".$sinceacc." secs ago)".
  print ("</font>");       "</font>";
     }      }
  }   }
     }      }
       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);      closedir(DIR);
     open (LOADAVGH,"/proc/loadavg");      open (LOADAVGH,"/proc/loadavg");
     my $loadavg=<LOADAVGH>;      my $loadavg=<LOADAVGH>;
Removed from v.1.13  
changed lines
  Added in v.1.14

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