--- lib/PXElator/httpd.pm	2009/08/13 12:45:30	215
+++ lib/PXElator/httpd.pm	2009/08/13 13:06:18	216
@@ -203,10 +203,10 @@
 
 			my $deploy;
 
-			if ( my $mac = client::mac( $ip ) ) {
+			if ( my $mac = client::mac_from_ip( $ip ) ) {
 				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
 				push @table, (
-					'mac' => $mac,
+					'mac' => format::mac( $mac => 'html' ),
 					'deploy' => html::select( 'deploy', $deploy, config::available )
 				);
 				$deploy = qq|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
@@ -243,13 +243,14 @@
 					map {
 						my $ip = $_;
 						$ip =~ s{^.+/ip/}{};
-						my $arp = $arp->{ client::mac $ip, 'clean' };
+						my $mac = client::mac_from_ip $ip;
+						my $arp = $arp->{ $mac };
 						$arp = $arp ? $arp->[1] : '';
 						$arp =~ s{$ip}{};
 						(
 							qq|<a href=/client/$ip>$ip</a>|
 							, client::conf( $ip, 'hostname' )
-							, client::mac( $ip )
+							, format::mac( $mac => 'html' )
 							, html::tt( client::conf( $ip, 'deploy' ) )
 							, $arp
 						);
@@ -260,7 +261,7 @@
 				, html::table( -3, 'mac', 'dev', 'ip',
 					map {
 						my $c = $arp->{$_};
-						( html::tt( $_ ), $c->[1], $c->[0] )
+						( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
 					} sort keys %$arp
 				)
 				;