--- loncom/cgi/userstatus.pl	2008/12/25 01:56:03	1.18
+++ loncom/cgi/userstatus.pl	2018/07/05 15:23:59	1.21
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 $|=1;
 # User Status
-# $Id: userstatus.pl,v 1.18 2008/12/25 01:56:03 raeburn Exp $
+# $Id: userstatus.pl,v 1.21 2018/07/05 15:23:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,7 @@ sub main {
     delete $$perlvar{'lonReceipt'}; # remove since sensitive and not needed
     delete $$perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
 
-    if (!&LONCAPA::lonauthcgi::check_ipbased_access()) {
+    if (!&LONCAPA::lonauthcgi::check_ipbased_access('userstatus')) {
         if (!&LONCAPA::loncgi::check_cookie_and_load_env()) {
             &Apache::lonlocal::get_language_handle();
             print &LONCAPA::loncgi::missing_cookie_msg();
@@ -121,7 +121,13 @@ sub main {
     
     unless ($oneline) {
         my $now = time();
-        print '<html><body bgcolor="#FFFFFF">'."\n".
+        print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n".
+              '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n"."\n".
+              '<head>'."\n".
+              '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n".
+              '<title>LON-CAPA '.$lt{'usrs'}.'</title>'."\n".
+              '</head>'."\n".
+              '<body style="background-color:#FFFFFF">'."\n".
               "<h1>$lt{'usrs'} ".&Apache::lonlocal::locallocaltime($now).'</h1>';
     }
 
@@ -131,6 +137,7 @@ sub main {
     foreach my $filename (@allfiles) {
 	if ($filename=~/^\./) { next; }
 	if ($filename=~/^publicuser_/) { next; }
+        if ($filename=~/^[a-f0-9]+_(linked|lti_\d+)\.id$/) { next; }
 	my ($dev,$ino,$mode,$nlink,
 	    $uid,$gid,$rdev,$size,
 	    $atime,$mtime,$ctime,
@@ -154,18 +161,18 @@ sub main {
 	    }
 	    if (!$justsummary) {
 		$users{$userclass}{$filename} .=
-		    '<font color="'.$color.'">'.
+		    '<div style="color:'.$color.'">'.
 		    '<h3>'.$userinfo{'environment.lastname'}.', '.
 		    $userinfo{'environment.firstname'}.' '.
 		    $userinfo{'environment.middlename'}.' '.
 		    $userinfo{'environment.generation'}." (".
-		    $userinfo{'user.name'}."\@".$userinfo{'user.domain'}.
+		    $userinfo{'user.name'}.":".$userinfo{'user.domain'}.
 		    ")</h3>\n".
 		    "<p><tt>$filename</tt></p>".
 		    "<b>$lt{'login'}:</b> ".
 		    &Apache::lonlocal::locallocaltime($userinfo{'user.login.time'}).
 		    " <b>$lt{'Browser'}</b>: ".$userinfo{'browser.type'}.
-		    " $lt{'on'} ".$userinfo{'browser.os'}."<b>$lt{'Client'}:</b>".
+		    " $lt{'on'} ".$userinfo{'browser.os'}." <b>$lt{'Client'}:</b>".
 		    $userinfo{'request.host'}."<br />\n<b>$lt{'role'}: </b>".
 		    $userinfo{'request.role'}." ";
 	    }
@@ -191,7 +198,7 @@ sub main {
 		    "<br /><b>$lt{'ltra'}:</b> ".&Apache::lonlocal::locallocaltime($mtime).
 		    " (".$since." $lt{'secs'}) <br /><b>$lt{'lacc'}:</b> ".
 		    &Apache::lonlocal::locallocaltime($atime)." (".$sinceacc." $lt{'secs'})".
-		    "</font>";
+		    "</div>";
 	    }
 	}
 	untie(%userinfo);
@@ -219,7 +226,7 @@ sub main {
 	&show('OS',\%lt,%usercount);
 
 #	print "\n</pre>";
-	print "<b>$lt{'load'}:<b> ".$loadavg;
+	print "<b>$lt{'load'}:</b> ".$loadavg;
 	print "</body></html>";
     } else {
 	foreach my $l1 (sort keys %usercount) {
@@ -259,7 +266,7 @@ sub showact {
     my ($cat,$ltref,%usercount)=@_;
     print("<h3>$ltref->{$cat}</h3>\n");
     
-    print("<table border='1'><tr><th></th><th>");
+    print("<table border='1'><tr><th>&nbsp;</th><th>");
     print(join("</th><th>",('Any',@actl)));
     print("</th></tr>");
     foreach my $type (sort(keys(%{$usercount{$cat}}))) {
@@ -272,7 +279,8 @@ sub showact {
 	}
 	print("<td>$count</td>");
 	print($temp);
+	print('</tr>');
     }    
-    print("</tr></table>\n");
+    print("</table>\n");
 }
 
