[Netpass-devel] NetPass/www/htdocs/Admin netgroups.mhtml,1.5,1.6 qc.mhtml,1.21,1.22

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

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

Modified Files:
	netgroups.mhtml qc.mhtml 
Log Message:


Index: qc.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/qc.mhtml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- qc.mhtml	4 May 2005 20:22:17 -0000	1.21
+++ qc.mhtml	17 May 2005 20:34:28 -0000	1.22
@@ -528,7 +528,7 @@
 	my $rv = "";
 	my @rv;
 
-	my $sql = "UPDATE register SET status=?, message=?, uqlinkup=? WHERE macAddress = ?";
+	my $sql = "UPDATE register SET status=?, uqlinkup=? WHERE macAddress = ?";
         my $sth   = $dbh->prepare($sql);
 	if (!defined($sth)) {
 		return "Failed to prepare sql: ".$dbh->errstr;
@@ -636,8 +636,6 @@
 			if ($args->{"message:$mac"} eq "--None--") {
 				return "Error: $mac PQUAR requires that you specify a message.";
 			} else {
-				#push @params, $args->{"message:$mac"};
-				push @params, undef;
 				$resultsRV = $np->db->addResult(-mac => $mac, -type => 'manual', 
 								   -id => $args->{"message:$mac"});
 			}
@@ -645,10 +643,7 @@
 
 		elsif ($args->{"status:$mac"} eq "QUAR") {
 			if ($args->{"message:$mac"} eq "--None--") {
-				push @params, undef;
 			} else {
-				push @params, undef;
-				#push @params, $args->{"message:$mac"};
 				$resultsRV = $np->db->addResult(-mac => $mac, -type => 'manual', 
 								-force => 1,
 								-id => $args->{"message:$mac"});
@@ -808,29 +803,22 @@
 <li> When setting a machine to UNQUAR or PUNQUAR:
 <ul>
 The port is set back to quarantined (yes, that's not a typo) 
-within 10 seconds of clicking 'save changes'. 
-The message field is implicitly set to 'None'. 
+within 10 seconds of clicking 'save changes'. You should clear any 'pending' results by setting them to 'fixed'.
 When they go to the website, it detects that they are unquarantined, changes their port 
-and sends them to the success page. <P>
-
-Presently, UNQUAR and PUNQUAR look/act the same. In the future, the IDS feature 
-will use these. For example, you will be 
-able to permanently unquarantine a host so that the IDS can not re-quarantine it.<P>
+and sends them to the success page. If you forget to clear pending results, they will
+be sent to the remediation page. <P>
 </Ul> 
 
 <li> When setting a machine to QUAR or PQUAR:
 <ul>
 The port is changed to quarantined within 10 seconds of clicking 'save changes'. 
-If you set a message, they are given that message when they access the web. 
-Otherwise, if the message is "None", they are scanned.<P>
-
-PQUAR requires that a message be set. QUAR does not require a message.
+If you add a result, they are given that message when they access the web. 
+Otherwise, if no results are pending, they are scanned.<P>
+When using PQUAR be sure to add at least one result, otherwise the client won't know why they are
+permenantly quarantined. QUAR does not require any results to be pending.
 <P>
-
-Presently, PQUAR and QUAR look/act the same. In the future, these will be used to 
-implement the IDS "two strikes" feature by setting a message, but 
-on the first strike you are only QUAR and the second strike you are PQUAR.
 </ul>
+
 </ul>
 
 

Index: netgroups.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/netgroups.mhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- netgroups.mhtml	6 May 2005 03:09:33 -0000	1.5
+++ netgroups.mhtml	17 May 2005 20:34:28 -0000	1.6
@@ -142,11 +142,9 @@
         # if a netgroup has no members, delete it
 
 	my $newANGs = [];
-	_log("DEBUG", "purge\n");
 	my $rv = '';
 
         foreach my $ngn (@{$np->cfg->getNetgroups()}) {
-	_log("DEBUG", "purge $ngn\n");
 		my $members = $np->cfg->getNetgroupMembers(-group => $ngn);
 		if (ref($members) eq "ARRAY" && ($#{$members} == -1)) {
 			_log("DEBUG", "$ip $whoami $ngn has no members. deleting.\n");
@@ -156,7 +154,6 @@
 				_log("DEBUG", "$ip $whoami failed to delete empty netgroup $ngn: $rv\n");
 			}
 		} else {
-	_log("DEBUG", "still OK $ngn\n");
 			push @$newANGs, $ngn;
 		}
 	}