--- lib/PXElator/httpd.pm	2009/08/28 23:30:38	334
+++ lib/PXElator/httpd.pm	2009/08/29 15:30:49	343
@@ -56,6 +56,8 @@
 use wireshark;
 use syslogd;
 use nmap;
+use ping;
+use wol;
 
 use CouchDB;
 
@@ -239,21 +241,24 @@
 		if ( $ip && $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
+			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
+
 			my @table = (
 				'ip' => qq|<input type=text name=change_ip value="$ip" onChange="document.getElementById('old_ip').style.display = '';"><span id=old_ip style="display: none; color: #888;">old: $ip<span>|,
 				'hostname' => qq|<input type=text name=hostname value="$hostname">|,
+				'ping' => ping::host($ip) ? qq|<span style="color:green">up</span> $nmap| : qq|<a href=/wol/$ip title=wol>down</a> $nmap|,
 			);
 
-			my $deploy;
+			my $config;
 
 			if ( my $mac = client::mac_from_ip( $ip ) ) {
-				$deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
+				my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
 				push @table, (
 					'mac' => format::mac( $mac => 'html' ),
 					'deploy' => html::select( 'deploy', $deploy, config::available )
 				);
-				if ( my $pxelinux = config::for_ip( $ip ) ) {
-					$deploy = qq|<h2>PXElinux</h2>| . html::pre( $pxelinux );
+				if ( $config = config::for_ip( $ip ) ) {
+					$config = qq|<h2>config</h2>| . html::pre( $config );
 				}
 			}
 
@@ -264,7 +269,7 @@
 					<input type=submit name=action value=change>
 					<input type=submit name=action value=remove style="color: red">
 					</form>|
-				, $deploy
+				, $config
 				;
 
 			if ( my $amt = client::conf( $ip, 'amt' ) ) {
@@ -285,8 +290,8 @@
 
 			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
-				, html::table( -6,
-					'ip', 'mac', 'dev', 'hostname', 'deploy', 'conf',
+				, html::table( -5,
+					'ip', 'mac', 'dev', 'hostname', 'conf',
 					map {
 						my $ip = $_;
 						my $conf = client::all_conf( $ip );
@@ -303,8 +308,18 @@
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
-							, delete $conf->{deploy}
-							, ( %$conf ? html::pre_dump( $conf ) : qq|<a href=/nmap?scan=$ip>nmap</a>| )
+							, join("\n", map {
+								my $name = $_;
+								my $html = $conf->{$name};
+								if ( $name eq 'amt' ) {
+									$html = qq|<a title="$html" href=http://$ip:16992/logon.htm>logon</a>|;
+								}
+								$html = qq|<pre style="display: inline">$html</pre>|
+								unless
+#0 &&
+								$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
+								qq|<em>$name</em> $html<br>|
+							} keys %$conf )
 						);
 					} client::all_ips
 				)
@@ -344,6 +359,8 @@
 				</form>
 			|;
 		}
+	} elsif ( $path =~ m{^/wol/(\S+)} ) {
+		print $client redirect( "$url/client/$1" ), wol::power_on($1);
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;