--- lib/PXElator/httpd.pm	2009/08/29 15:30:49	343
+++ lib/PXElator/httpd.pm	2009/08/30 15:22:41	376
@@ -239,29 +239,27 @@
 		}
 
 		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 @editable = ( qw/hostname config homepage/ );
+
+			client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
+
+			my $conf = client::all_conf( $ip );
+			my $config = delete $conf->{config};
 
+			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
 			my @table = (
+				'ping' => ping::host($ip)
+					? qq|<span style="color:green">up</span> $nmap|
+					: qq|<span style="color: red">down</span> <a href=/wol/$ip>wol</a> $nmap|
+					,
 				'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|,
+				'mac' => format::mac( delete $conf->{mac}, 'html' ),
+				'hostname' => qq|<input type=text name=hostname value="| . delete($conf->{hostname}) . qq|">|,
+				'config' => html::select( 'config', $config, config::available ),
+				html::conf( $ip, $conf, 'edit', @editable )
 			);
 
-			my $config;
-
-			if ( my $mac = client::mac_from_ip( $ip ) ) {
-				my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
-				push @table, (
-					'mac' => format::mac( $mac => 'html' ),
-					'deploy' => html::select( 'deploy', $deploy, config::available )
-				);
-				if ( $config = config::for_ip( $ip ) ) {
-					$config = qq|<h2>config</h2>| . html::pre( $config );
-				}
-			}
-
 			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
@@ -269,13 +267,16 @@
 					<input type=submit name=action value=change>
 					<input type=submit name=action value=remove style="color: red">
 					</form>|
-				, $config
 				;
 
-			if ( my $amt = client::conf( $ip, 'amt' ) ) {
-				print $client qq|<h2>AMT</h2>|, amt::info( $amt, $ip );
+			if ( $config ) {
+				if ( my $for_ip = config::for_ip( $ip ) ) {
+					print $client qq|<h2>config::for_ip</h2>| . html::pre( $for_ip );
+				}
 			}
 
+			print $client qq|<h2>amt info</h2>|, amt::info( $ip );
+
 		} else {
 
 			my @ping;
@@ -308,19 +309,8 @@
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
-							, 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 )
-						);
+							, html::conf( $ip, $conf, 'inline' )
+						)
 					} client::all_ips
 				)
 				;
@@ -361,6 +351,9 @@
 		}
 	} elsif ( $path =~ m{^/wol/(\S+)} ) {
 		print $client redirect( "$url/client/$1" ), wol::power_on($1);
+	} elsif ( $path =~ m!^/amt/(\w+)/$RE{net}{IPv4}{-keep}! ) {
+		my ( $run, $ip ) = ( $1, $2 );
+		print $client redirect( "$url/client/$ip" ), amt::RemoteControl( $ip, $run );
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
@@ -399,6 +392,8 @@
 
 	print "url $url\n";
 
+	syslogd::install_local;
+
 	while (1) {
 		my $client = $server->accept() || next; # ALARM trickle us
 		my $request = <$client>;