--- lib/PXElator/client.pm	2009/08/11 15:55:26	200
+++ lib/PXElator/client.pm	2009/08/12 23:59:01	208
@@ -7,6 +7,7 @@
 use server;
 use File::Slurp;
 use Net::Ping;
+use format;
 
 sub mac_path { $server::conf . '/mac/' . $_[0] }
 sub  ip_path { $server::conf . '/ip/'  . join('/', @_) }
@@ -44,14 +45,9 @@
 }
 
 sub mac {
-	my ( $ip, $op ) = @_;
-	$op ||= 'html';
-	my $mac = client::conf( $ip, 'mac' );
-	return '' unless $mac;
-	$mac =~ s{(..)}{$1:}g;
-	$mac =~ s{:$}{};
-	$mac = qq|<tt>$mac</tt>| if (caller(1))[3] =~ m{^httpd} && $op ne 'clean';
-	return uc($mac);
+	my $ip = shift;
+	my $mac = client::conf( $ip, 'mac' ) || return '';
+	format::mac( $ip, @_ );
 }
 
 sub next_ip($) {