--- lib/PXElator/httpd.pm 2009/08/29 00:06:32 335
+++ lib/PXElator/httpd.pm 2009/08/29 17:03:35 347
@@ -239,26 +239,25 @@
}
if ( $ip && $ip ne $server::ip ) {
- my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
+ 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|nmap|;
my @table = (
+ 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down wol $nmap|,
'ip' => qq|old: $ip|,
- 'hostname' => qq||,
- 'ping' => ping::host($ip) ? qq|up| : qq|down|,
+ 'mac' => format::mac( delete $conf->{mac}, 'html' ),
+ '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|config
| . html::pre( $config );
- }
- }
+warn "XX conf ",dump( $conf );
print $client ok
, qq||
- , $config
;
+ if ( $config ) {
+ if ( my $for_ip = config::for_ip( $ip ) ) {
+ print $client qq|config::for_ip
| . html::pre( $for_ip );
+ }
+ }
+
if ( my $amt = client::conf( $ip, 'amt' ) ) {
print $client qq|AMT
|, amt::info( $amt, $ip );
}
@@ -288,8 +292,8 @@
print $client ok
, qq|Clients on $server::ip
|
- , 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 );
@@ -306,9 +310,8 @@
, format::mac( $mac => 'html' )
, $arp->{$mac}
, delete $conf->{hostname}
- , delete $conf->{deploy}
- , ( %$conf ? html::pre_dump( $conf ) : qq|nmap| )
- );
+ , html::conf( $ip, $conf, 'inline' )
+ )
} client::all_ips
)
;