[Netpass-devel] NetPass/www/components/Admin FormNPPolicy,1.2,1.3 FormNPSnort,1.6,1.7 TableEditPolicy,1.6,1.7

[jeff m. <jef...@us...>]

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

Modified Files:
	FormNPPolicy FormNPSnort TableEditPolicy 
Log Message:
some bug fixes, resetport.pl re-write, appstarter completion, install/initd tweaks

Index: TableEditPolicy
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/TableEditPolicy,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TableEditPolicy	19 May 2005 20:15:05 -0000	1.6
+++ TableEditPolicy	3 Aug 2005 02:44:39 -0000	1.7
@@ -327,6 +327,21 @@
 % }
 </TR>
 <TR>
+<TD CLASS='left'>ResetPort Max Port Poll Time</TD>
+<TD CLASS='right'>
+<%$q->textfield (
+                        -name     => 'policy:resetport_port_poll_time',
+                        -default  => $np->cfg->policy(-key => 'resetport_port_poll_time', -network => $network),
+                        -size     => 5
+                    )%> seconds
+</TD>
+% if ($showDefault) {
+<td class='center'><input type='checkbox' <%!$np->cfg->policyLocation(-key => 'resetport_port_poll_time', -network => $network, -location => $formatFor)?"":"checked"%> name="override:resetport_port_poll_time"></td>
+<td class='right'><%$np->cfg->policy(-key => 'resetport_port_poll_time')%> secs</td><td class='left'>
+(<%join(',', @{$np->cfg->policyLocation(-key => 'resetport_port_poll_time', -network => $network)})%>)</td>
+% }
+</TR>
+<TR>
 <TD CLASS='left'>ResetPort Link Flap Tolerance</TD>
 <TD CLASS='right'>
 <%$q->textfield (

Index: FormNPPolicy
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/FormNPPolicy,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FormNPPolicy	14 Jun 2005 20:34:17 -0000	1.2
+++ FormNPPolicy	3 Aug 2005 02:44:39 -0000	1.3
@@ -196,6 +196,15 @@
                     )%>
 </TD></TR>
 <TR>
+<TD CLASS='left'>ResetPort Max Port Poll Time</TD>
+<TD CLASS='right'>
+<%$q->textfield (
+                        -name     => 'policy:resetport_port_poll_time',
+                        -default  => $np->cfg->policy(-key => 'resetport_port_poll_time'),
+			-size     => 5
+                    )%> seconds
+</TD></TR>
+<TR>
 <TD CLASS='left'>ResetPort Link Flap Tolerance</TD>
 <TD CLASS='right'>
 <%$q->textfield (

Index: FormNPSnort
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/FormNPSnort,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FormNPSnort	14 Jun 2005 21:41:08 -0000	1.6
+++ FormNPSnort	3 Aug 2005 02:44:39 -0000	1.7
@@ -47,6 +47,7 @@
 
 <%perl>
 	my $h = $np->cfg->snort(-key => 'servers', -network => $network);
+	if ($h && (ref($h) eq "HASH")) {
 	foreach my $s (keys %$h) {
 		my($server, $port) = split(/:/, $s);
 		print "<TR>";
@@ -66,6 +67,7 @@
 				   );
 		print "</TD></TR>";
 	}
+	}
 	print "<TR>";
 	print "<TD CLASS=\"gray\" ALIGN=center>";
 	print $q->textfield (
@@ -113,6 +115,7 @@
 </TR>
 
 <%perl>
+		if ($h && (ref($h) eq "HASH")) {
 	        foreach my $s (keys %$h) {
 	                my($server, $port) = split(/:/, $s);
 	                print "<TR>";
@@ -121,6 +124,7 @@
 	                print "<TD CLASS=\"gray\" ALIGN=center>".$np->cfg->snort(-key => $s, -sval => 'servers');
 	                print "</TD></TR>";
 	        }
+		}
 
 		print "</TABLE></TD>";