--- lib/PXElator/httpd.pm 2009/08/30 15:22:41 376 +++ lib/PXElator/httpd.pm 2009/09/07 21:57:35 392 @@ -19,8 +19,25 @@ use IO::Socket::INET; use Regexp::Common qw/net/; -sub menu {qq{ +our $title; +sub html_start { +qq{ + + +$title + + +}} + +sub html_end { +qq{ + + +}} + +sub menu { +qq{
home server @@ -109,7 +126,7 @@ } sub ok { - qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu() + qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . html_start() . menu() } sub redirect { @@ -125,6 +142,8 @@ CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); + $title = $path; + if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; } elsif ( $path eq '/' ) { @@ -154,12 +173,15 @@ ; } - if ( $name->can('fork_if_active') ) { - $html .= qq| $_| foreach $name->fork_if_active; + my $class = $name; + $class =~ s{\.\d+$}{}; + + if ( $class->can('fork_if_active') ) { + $html .= qq| $_| foreach $class->fork_if_active; } - if ( $name->can('actions') ) { - $html .= qq| $_| foreach $name->actions; + if ( $class->can('actions') ) { + $html .= qq| $_| foreach $class->actions; } } else { if ( $pid =~ m{^\d+$} ) { @@ -201,16 +223,23 @@ ; } elsif ( $path =~ m{^/server} ) { + if ( my $c = $param->{new_clients} ) { + server::shared( 'new_clients', $c ); + } print $client ok + , qq|
| , html::table( 2, 'debug' => qq|$debug|, + 'new_clients' => qq||, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) ) + , qq|
| ; } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { my $ip = $1; + $title = $ip; if ( $param->{action} eq 'remove' ) { client::remove( $param->{change_ip} ); @@ -275,7 +304,10 @@ } } - print $client qq|

amt info

|, amt::info( $ip ); + if ( $conf->{amt} ) { + print $client qq|

amt network

|, html::pre_dump( amt::network( $ip ) ); + print $client qq|

amt log

|, html::pre_dump( amt::log( $ip ) ); + } } else { @@ -305,7 +337,7 @@ if $ping; $style ||= ''; ( - qq|$ip| + qq|$ip| , format::mac( $mac => 'html' ) , $arp->{$mac} , delete $conf->{hostname} @@ -360,9 +392,11 @@ print $client redirect($url), qq|$1 = $2
Location: $url|; 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,$param); } elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) { - $1->$2(); + my ( $package, $method ) = ( $1, $2 ); + $ENV{nr} = $1 if $package =~ s{\.(\d+)$}{}; + $package->$method(); print $client redirect; } elsif ( $path =~ m{^/kill/static/(\d+)} ) { print $client redirect; @@ -378,9 +412,9 @@ warn 'network ', network::setup(); - daemons::start_stop 'browser', $url; + daemons::start_stop 'browser', { url => $url }; daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ ); - daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device +# daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device my $server = IO::Socket::INET->new( Proto => 'tcp', @@ -417,7 +451,7 @@ warn "500 $request"; } - print $client menu() if $client->connected; + print $client menu() . html_end() if $client->connected; }