From 625def6a2bace40057723611177335790714db4a Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 29 Aug 2009 16:51:07 +0000
Subject: [PATCH] make selected configuration options for clients editable or
 returned in table format

---
 lib/PXElator/html.pm  | 34 ++++++++++++++++++++++++++++++++++
 lib/PXElator/httpd.pm | 42 ++++++++++++++++++------------------------
 lib/PXElator/t/html.t | 12 +++++++++++-
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/lib/PXElator/html.pm b/lib/PXElator/html.pm
index 80a3de5..a6af381 100644
--- a/lib/PXElator/html.pm
+++ b/lib/PXElator/html.pm
@@ -66,6 +66,40 @@ sub pre_dump {
 	qq|<pre>$dump</pre>|;
 }
 
+sub conf {
+	my ($ip,$conf,$format) = @_;
+	my @editable = splice(@_,3);
+
+	warn "# conf ",dump( $ip, $conf, $format, [ @editable ] );
+
+	$format ||= 'inline';
+
+	my @opts = map {
+		my $name = $_;
+		my $html = $conf->{$name};
+
+		if ( $format eq 'edit' && grep { m/^$name$/ } @editable ) {
+			$size = length($html);
+			( $name, qq|<input name=$name value="$html" size=$size>| )
+		} else {
+			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
+			$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
+		
+			if ( $format =~ /edit|table/ ) {
+				( $name, $html );
+			} else {
+				qq|<em>$name</em> $html<br>|
+			}
+		}
+	} keys %$conf;
+
+	$format eq 'inline' ? join("\n", @opts) : @opts;
+}
+
 warn "loaded";
 
 1;
diff --git a/lib/PXElator/httpd.pm b/lib/PXElator/httpd.pm
index 5084eed..cf1edc3 100644
--- a/lib/PXElator/httpd.pm
+++ b/lib/PXElator/httpd.pm
@@ -239,24 +239,29 @@ warn "XXX pids = ", dump( $daemons::pids );
 		}
 
 		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 deploy homepage/ );
+
+			client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
+
+			my $conf = client::all_conf( $ip );
+			my $deploy = delete $conf->{deploy};
 
+			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|,
+				'mac' => format::mac( delete $conf->{mac}, 'html' ),
+				'hostname' => qq|<input type=text name=hostname value="| . delete($conf->{hostname}) . qq|">|,
+				'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|,
+				'deploy' => html::select( 'deploy', $deploy, config::available ),
+				html::conf( $ip, $conf, 'edit', @editable )
 			);
 
-			my $config;
+warn "XX conf ",dump( $conf );
+
+			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 ( $deploy ) {
 				if ( $config = config::for_ip( $ip ) ) {
 					$config = qq|<h2>config</h2>| . html::pre( $config );
 				}
@@ -308,19 +313,8 @@ warn "XXX pids = ", dump( $daemons::pids );
 							, 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
 				)
 				;
diff --git a/lib/PXElator/t/html.t b/lib/PXElator/t/html.t
index 1f56df6..7cd3a8b 100755
--- a/lib/PXElator/t/html.t
+++ b/lib/PXElator/t/html.t
@@ -4,7 +4,8 @@ use warnings;
 use strict;
 use autodie;
 
-use Test::More tests => 5;
+use Test::More tests => 8;
+use Data::Dump qw/dump/;
 
 use_ok 'html';
 
@@ -19,3 +20,12 @@ diag $html;
 
 ok( $html = html::pre_dump( foo => 1, bar => 'baz' ), 'pre_dump' );
 diag $html;
+
+ok( $html = html::conf( '127.0.0.1', { foo => 1, bar => 'baz' } ), 'conf' );
+diag $html;
+
+ok( my @t = html::conf( '127.0.0.1', { foo => 1, bar => 'baz' }, 'table' ), 'conf table' );
+diag dump @t;
+
+ok( @t = html::conf( '127.0.0.1', { foo => 1, bar => 'baz' }, 'edit', 'foo' ), 'conf edit' );
+diag dump @t;
-- 
2.20.1