Update of /cvsroot/netpass/NetPass/www/htdocs/Admin/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6223/www/htdocs/Admin/reports
Modified Files:
byclient.mhtml bynet.mhtml
Log Message:
bug fixes
Index: byclient.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/reports/byclient.mhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- byclient.mhtml 22 Aug 2005 19:26:08 -0000 1.5
+++ byclient.mhtml 9 Sep 2005 12:32:11 -0000 1.6
@@ -146,7 +146,7 @@
$q->TR(
$q->th("Neighbor") .
$q->th("Status") .
- $q->th("UBIT Name") .
+ $q->th($np->cfg->policy(-key => 'USERNAME_PROMPT', -network => 'default')) .
$q->th("IP Address") .
$q->th("OS")
);
Index: bynet.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/reports/bynet.mhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bynet.mhtml 6 Sep 2005 20:29:18 -0000 1.7
+++ bynet.mhtml 9 Sep 2005 12:32:11 -0000 1.8
@@ -81,9 +81,14 @@
my $totalInQuar = 0;
my $totalPingable = 0;
- foreach my $network (NetPass::Network::ipsort([keys %netStats])) {
- my $dottedNetwork = int2ip($network)."/".
- int2cidr($masks{$network});
+ my %dottedNetworks;
+ foreach my $netInt (keys %netStats) {
+ $dottedNetworks{int2ip($netInt)} = $netInt;
+ }
+
+ foreach my $dottedNetwork ( NetPass::Network::ipsort([ keys %dottedNetworks ]) ) {
+ my $network = $dottedNetworks{$dottedNetwork};
+ $dottedNetwork .= "/".int2cidr($masks{$network});
# pinging the broadcast doesnt seem to populate the linux
# arp table, so we wont bother.
@@ -97,7 +102,6 @@
if ($minq->{$_ip} =~ "incomplete") {
delete $minq->{$_ip};
}
-
}
} else {
$minq = "" if $minq =~ "incomplete";
@@ -108,7 +112,6 @@
$allMacs =~ tr [A-Z] [a-z];
$allMacs =~ s/\ /%20/g;
my $byClient = "byclient.mhtml?macs=$allMacs";
-
my $aq = 0; my $aq2 = 0;
if (ref($minq) eq "HASH") {
|
