From b90f8cdac9371c219a72dda16f8deecc7c44fc28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Dec 2000 20:25:20 +0000
Subject: session monitor updates

---
 htdocs/browse/nas.cgi    | 25 ++++++++++++++++++++++---
 htdocs/view/svc_acct.cgi |  9 ++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'htdocs')

diff --git a/htdocs/browse/nas.cgi b/htdocs/browse/nas.cgi
index 2aafbc1..a65235b 100755
--- a/htdocs/browse/nas.cgi
+++ b/htdocs/browse/nas.cgi
@@ -33,10 +33,29 @@ foreach my $nas ( sort { $a->nasnum <=> $b->nasnum } qsearch( 'nas', {} ) ) {
   ;
   foreach my $port ( sort {
     $a->nasport <=> $b->nasport || $a->portnum <=> $b->portnum
-  } qsearch( 'port' ) ) {
+  } qsearch( 'port', { 'nasnum' => $nas->nasnum } ) ) {
+    my $session = $port->session;
+    my($user, $since, $pretty_since, $duration);
+    if ( ! $session ) {
+      $user = "(empty)";
+      $since = 0;
+      $pretty_since = "(never)";
+      $duration = '';
+    } elsif ( $session->logout ) {
+      $user = "(empty)";
+      $since = $session->logout;
+    } else {
+      my $svc_acct = $session->svc_acct;
+      $user = "<A HREF=\"$p/view/svc_acct.cgi?". $svc_acct->svcnum. "\">".
+              $svc_acct->username. "</A>";
+      $since = $session->login;
+    }
+    $pretty_since = time2str("%c", $since) if $since;
+    $duration = pretty_interval( $now - $since ). " ago"
+      unless defined($duration);
     print "<TR><TD>". $port->nasport. "</TD><TD>". $port->portnum. "</TD><TD>".
-          $port->ip. "</TD><TD>". 'user'. "</TD><TD>". 'since'. "</TD><TD>". 
-          'duration'. "</TD></TR>"
+          $port->ip. "</TD><TD>$user</TD><TD>$pretty_since".
+          "</TD><TD>$duration</TD></TR>"
     ;
   }
   print "</TABLE><BR>";
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index e203c7e..22c3d76 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.10 1999-04-14 11:27:06 ivan Exp $
+# $Id: svc_acct.cgi,v 1.11 2000-12-03 20:25:20 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,7 +33,10 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.10  1999-04-14 11:27:06  ivan
+# Revision 1.11  2000-12-03 20:25:20  ivan
+# session monitor updates
+#
+# Revision 1.10  1999/04/14 11:27:06  ivan
 # showpasswords config option to show passwords
 #
 # Revision 1.9  1999/04/08 12:00:19  ivan
@@ -138,7 +141,7 @@ $password = '';
 
 $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<BR>POP: <B>", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
-      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "<\B>"
+      " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, "</B>"
   if $svc_acct_pop;
 
 if ($svc_acct->uid ne '') {
-- 
cgit v1.1