--- lib/PXElator/httpd.pm	2009/08/10 16:36:16	193
+++ lib/PXElator/httpd.pm	2009/08/11 15:55:26	200
@@ -101,8 +101,15 @@
 	exit(0);
 }
 
-my $ok =       qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu();
-my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|;
+sub ok {
+	qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu()
+}
+
+sub redirect {
+	my $to = shift;
+	$to ||= $url;
+	qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n|
+}
 
 sub get_request {
 	my ( $client, $path, $param ) = @_;
@@ -169,7 +176,7 @@
 			}
 		}
 
-		print $client $ok
+		print $client ok
 			, html::table( 2, @rows )
 			, $below_table
 			, html::tabs( log::mac_changes )
@@ -177,17 +184,23 @@
 			;
 
 	} elsif ( $path =~ m{^/server} ) {
-		print $client $ok
+		print $client ok
 			, html::table( 2, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) )
 			;
 	} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
 		my $ip = $1 || $client->peerhost;
+
+		if ( my $new_ip = $param->{change_ip} ) {
+			client::change_ip( $ip, $new_ip );
+			$ip = $new_ip;
+		}
+
 		if ( $ip ne $server::ip ) {
 			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
 			my @table = (
-				'ip' => $ip,
-				'hostname' => qq|<input type=text name=hostname value=$hostname>|,
+				'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">|,
 			);
 
 			my $deploy;
@@ -201,7 +214,7 @@
 				$deploy = qq|<h2>PXElinux</h2>| . html::pre( config::for_ip( $ip ) );
 			}
 
-			print $client $ok
+			print $client ok
 				, qq|<form method=get>|
 				, html::table( 2, @table ),
 				, qq|<input type=submit value=change></form>|
@@ -225,7 +238,7 @@
 
 			warn "# arp ",dump( $arp );
 
-			print $client $ok
+			print $client ok
 				, qq|<h2>Clients on $server::ip</h2>|
 				, html::table( -5,
 					'ip', 'hostname', 'mac', 'deploy', 'arp',
@@ -257,15 +270,15 @@
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
-		print $client $redirect, qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
+		print $client redirect($url), qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
 		server::debug( $debug ) if $1 eq 'debug';
 	} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
-		print $client $redirect, daemons::start_stop($1);
+		print $client redirect, daemons::start_stop($1);
 	} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
 		$1->$2();
-		print $client $redirect;
+		print $client redirect;
 	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
-		print $client $redirect;
+		print $client redirect;
 		kill 1, $1 || kill 9, $2 && warn "killed $1";
 	} else {
 		print $client "HTTP/1.0 404 $path\r\nConnection: close\r\nContent-type: text/html\r\n\r\n<big>404 $path</big>";