[Netpass-devel] NetPass/www/components/Admin FormNPSnort,1.5,1.6

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

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

Modified Files:
	FormNPSnort 
Log Message:


Index: FormNPSnort
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/FormNPSnort,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FormNPSnort	14 Jun 2005 20:35:24 -0000	1.5
+++ FormNPSnort	14 Jun 2005 21:41:08 -0000	1.6
@@ -12,23 +12,24 @@
 <TH onclick="showHideObj2(getElementById('snortConfig').tBodies[0]);" COLSPAN=2>Snort</TH>
 </TR></THEAD>
 <TBODY>
-%} elsif ($formatFor eq "network") {
+%} elsif ($formatFor =~ /network|group/) {
 <THEAD><TR>
 <TH onclick="showHideObj2(getElementById('snortConfig').tBodies[0]);" COLSPAN=5>Snort Settings for <%$network%></TH>
 </TR></THEAD>
 <TBODY>
 <TR>
 <TH>Option</TH><TH>Value</TH><TH>Override Default</TH><TH COLSPAN=2>Default Value</TH>
+</TR>
 %}
 <TR><TD CLASS='left'>mode</TD>
 <TD CLASS='right'>
-<%$q->popup_menu (
-                        -name     => 'snort:mode',
-                        -values   => ['enabled', 'disabled', 'not_really'],
-                        -default  => $np->cfg->snort(-key => 'mode', -network => $network)
-                    )%>
+%print $q->popup_menu (
+%                        -name     => 'snort:mode',
+%                        -values   => ['enabled', 'disabled', 'not_really'],
+%                        -default  => $np->cfg->snort(-key => 'mode', -network => $network)
+%                     );
 </TD>
-% if ($formatFor eq "network" && $showDefault) {
+% if ($formatFor =~ /network|group/ && $showDefault) {
 <td class='center'><input type='checkbox' <%!$np->cfg->snortLocation(-key => 'mode', -network => $network, -location => $formatFor)? "" : "checked"%> name="override:mode"></td>
 <td class='right'><%$np->cfg->snort(-key => 'mode')%></td>
 <td class='left'>(<%join(',', @{$np->cfg->snortLocation(-key => 'mode', -network => $network)})%>)</td>
@@ -90,7 +91,7 @@
 
 	print "</TD></TR></TABLE></TD>";
 
-	if ($formatFor eq "network" && $showDefault) {
+	if ($formatFor =~ /network|group/ && $showDefault) {
 		my $c = !$np->cfg->snortLocation(-key => 'servers', -network => $network, -location => $formatFor) ? 0 : 1;
                 print "<TD CLASS='center'>";
 		print $q->checkbox (
@@ -130,4 +131,3 @@
 </TR>
 </TBODY>
 </TABLE>
-<BR>