--- lib/PXElator/httpd.pm 2009/08/24 22:04:39 284
+++ lib/PXElator/httpd.pm 2009/08/27 12:42:53 303
@@ -262,7 +262,7 @@
print $client ok
, qq|
Clients on $server::ip
|
, html::table( -5,
- 'ip', 'hostname', 'mac', 'deploy', 'arp',
+ 'ip', 'mac', 'hostname', 'deploy', 'arp',
map {
my $ip = $_;
$ip =~ s{^.+/ip/}{};
@@ -272,8 +272,8 @@
$arp =~ s{$ip}{};
(
qq|$ip|
- , client::conf( $ip, 'hostname' )
, format::mac( $mac => 'html' )
+ , client::conf( $ip, 'hostname' )
, html::tt( client::conf( $ip, 'deploy' ) )
, $arp
);
@@ -281,10 +281,10 @@
glob("$server::conf/ip/*")
)
, qq|ARP
|
- , html::table( -3, 'mac', 'dev', 'ip',
+ , html::table( -3, 'ip', 'mac', 'dev',
map {
my $c = $arp->{$_};
- ( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
+ ( $c->[0], format::mac( $_ => 'html' ), $c->[1] )
} sort keys %$arp
)
;