[Netpass-devel] NetPass/www/htdocs/Admin index.mhtml,1.8,1.9

[Matt <mt...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14835

Modified Files:
	index.mhtml 
Log Message:


Index: index.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/index.mhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.mhtml	27 Apr 2005 03:54:07 -0000	1.8
+++ index.mhtml	1 May 2005 13:03:11 -0000	1.9
@@ -47,8 +47,8 @@
 	
 
 	foreach my $arg (keys %$args) {
-		my($a, $h, $p) = split('_', $arg);
-		$actions->{"$h:$p"} = $args->{$arg};	
+		my($a, $hp) = split('_', $arg);
+		$actions->{$hp} = $args->{$arg};	
 	}
 
 	foreach my $nw (@$networks) {
@@ -59,22 +59,24 @@
 
 	push @rows,
        		$q->TR(
-       		         $q->th({-colspan=>3}, "Snort Sensors")
+       		         $q->th({-colspan=>4}, "Snort Sensors")
        		).
 		$q->TR({-class=>'gray'},
 			$q->td({-align=>"center"}, "Sensor").	
 			$q->td({-align=>"center"}, "Status").	
+			$q->td({-align=>"center"}, "Mode").	
 			$q->td({-align=>"center"}, "Action")	
 		);
 
 	foreach my $s (sort keys %$sensors) {
 		my $rv   = undef;
-		my $soap = makeSoapConnection($np, $s, $sensors->{$s});
+		my $soap = makeSoapConnection($np, split(':', $s));
 		my $sec  = $np->cfg->npapiSecret();
 		my $md5  = md5_hex(hostip.$sec);
+		my $srw  = ($sensors->{$s} eq 'rw') ? 1 : 0;
 
-		if ($rw && defined $soap) {
-			my $a = $actions->{$s.':'.$sensors->{$s}};
+		if ($rw && defined $soap && $srw) {
+			my $a = $actions->{$s};
 
 			if ($a eq "Start") {
 				eval{$soap->startSnort($md5)->result};
@@ -92,32 +94,34 @@
 		$rv = eval{$soap->snortStatus($md5)->result} if defined $soap;
 		push @rows, 
 			$q->TR({-class=>'gray'},
-				$q->td({-width=>"40%"}, $s.':'.$sensors->{$s}).
-				$q->td({-width=>"20%", -align=>"center"}, ($rv) ?
+				$q->td({-width=>"35%"}, $s).
+				$q->td({-width=>"15%", -align=>"center"}, ($rv) ?
 					"<B><FONT COLOR=green>Running</FONT></B>" :
-					"<B><FONT COLOR=red>Down</FONT></B>"). 
+					"<B><FONT COLOR=red>Down</FONT></B>").
+				$q->td({-width=>"10%", -align=>"center"}, 
+					'<B>'.$sensors->{$s}.'</B>'). 
 				$q->td({-width=>"40%", -align=>"center"},
 					$q->submit(
-						    -name     => join('_', 'start', $s, $sensors->{$s}),
+						    -name     => join('_', 'start', $s),
 						    -value    => 'Start', 
-						    (!$rv && $rw) ? "" : "disabled"
+						    (!$rv && $rw && $srw) ? "" : "disabled"
 						  ).
                                         $q->submit(
-                                                    -name     => join('_', 'stop', $s, $sensors->{$s}),
+                                                    -name     => join('_', 'stop', $s),
                                                     -value    => 'Stop',
-						    ($rv && $rw) ? "" : "disabled"
+						    ($rv && $rw && $srw) ? "" : "disabled"
                                                   ).
 					$q->submit(
-						    -name     => join('_', 'restart', $s, $sensors->{$s}),
+						    -name     => join('_', 'restart', $s),
 						    -value    => 'Restart',
-						    ($rv && $rw) ? "" : "disabled"
+						    ($rv && $rw && $srw) ? "" : "disabled"
 						  )
 				)
 			);
 	
 	}
 
-	print $q->table( {-border=>0, -width=>500}, @rows);
+	print $q->table( {-border=>0, -width=>550}, @rows);
 	return;
 }