[Netpass-devel] NetPass/www/components/Admin FormAuthLDAP,1.2,1.3 FormAuthRadius,1.2,1.3

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

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

Modified Files:
	FormAuthLDAP FormAuthRadius 
Log Message:
bug fixes to userform, arp table searching (osx), ldap ui, auth.mhtml ui

Index: FormAuthRadius
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/FormAuthRadius,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FormAuthRadius	8 Jun 2005 16:35:41 -0000	1.2
+++ FormAuthRadius	23 Jun 2005 20:21:08 -0000	1.3
@@ -6,42 +6,35 @@
 	$prefix => '';
 	$server => '';
 </%args>
-<script language='JavaScript'>
-var <%$prefix%>radiusSecrets = new Object();
 <%perl>
 my $rs_ = $np->cfg->getRadius();
 my $rs  = (ref($rs_) eq "ARRAY") ? $rs_ : [];
 my $WH  = "----------------";
 my $ml  = length($WH);
+
 foreach my $server (@$rs) {
 	$ml = ($ml > length($server)) ? $ml : length($server);
-	my $sh = $np->cfg->getRadius($server);
-        if (ref($sh) eq "HASH") {
-		print qq{//$server\n};
-		print qq{${prefix}radiusSecrets['$server'] = '$sh->{secret}';\n};
-	}
 }
 $ml = int($ml * 1.5);
 $WH = "-" x $ml;
 </%perl>
-</script>
 <table border=0 id='<%$prefix%>FormAuthRadius'>
 <tr><th>Radius Servers</th><th colspan=2>Options</th></tr>
 <tr><td><%$q->scrolling_list(-id => $prefix.'radiusServer', -name => $prefix.'radiusServer',
-			-onchange => 'radius_onchange_radiusServer();'
+			-onchange => "radius_onchange_radiusServer('$prefix');",
 			 -size => 4, -values => [ $WH, @$rs ])%><BR>
-	<input size=16 id='radiusAddServer' name='radiusAddServer'
-               onfocus='radius_onfocus_addServer('<%$prefix%>');'
-               onblur='radius_onblur_addServer('<%$prefix%>');'
+	<input size=16 id='<%$prefix%>radiusAddServer' name='<%$prefix%>radiusAddServer'
+               onfocus='radius_onfocus_addServer("<%$prefix%>");'
+               onblur='radius_onblur_addServer("<%$prefix%>");'
                value="Add Server..."
         >
-        <input type='submit' onclick='radius_onclick_delServer(); return false;'
+        <input type='submit' name="<%$prefix%>delRadiusServer"
                value='Delete Server'>
     </td>
     <td align='right' valign='top'>Secret:</td>
     <td align='left' valign='top'>
-        <input size=16 id='<%$prefix%>radiusSecret'><BR>
-
+        <input size=16 id='<%$prefix%>radiusSecret'
+		onblur="radius_onblur_radiusSecret('<%$prefix%>');"><BR>
     </td>
 </tr>
 </table>

Index: FormAuthLDAP
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/components/Admin/FormAuthLDAP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FormAuthLDAP	8 Jun 2005 16:35:41 -0000	1.2
+++ FormAuthLDAP	23 Jun 2005 20:21:08 -0000	1.3
@@ -6,10 +6,6 @@
 	$prefix => '';
 	$server => '';
 </%args>
-<script language='JavaScript'>
-var <%$prefix%>ldapBase = new Object();
-var <%$prefix%>ldapFilter = new Object();
-var <%$prefix%>ldapPField = new Object();
 <%perl>
 my $rs_ = $np->cfg->getLDAP();
 my $rs  = (ref($rs_) eq "ARRAY") ? $rs_ : [];
@@ -21,27 +17,35 @@
 $ml = int($ml * 1.5);
 $WH = "-" x $ml;
 </%perl>
-</script>
 
 <table border=0 id='<%$prefix%>FormAuthLDAP'>
 <tr><th>LDAP Servers</th><th>Options</th></tr>
 <tr><td align='center' valign='top'>
 	<%$q->scrolling_list(-id => $prefix.'ldapServer', -name => $prefix.'ldapServer',
-			-onchange => 'ldap_onchange_ldapServer();', 
+			-onchange => "ldap_onchange_ldapServer('$prefix');", 
 			 -size => 4, -values => [ $WH, @$rs ])%><BR>
-	<input size=16 id='ldapAddServer' name='ldapAddServer'
-               onfocus='ldap_onfocus_addServer('<%$prefix%>');'
-               onblur='ldap_onblur_addServer('<%$prefix%>');'
+	<input size=16 id='<%$prefix%>ldapAddServer' name='<%$prefix%>ldapAddServer'
+               onfocus='ldap_onfocus_addServer("<%$prefix%>");'
+               onblur='ldap_onblur_addServer("<%$prefix%>");'
                value="Add Server..."
         > 
-        <input type='submit' onclick='ldap_onclick_delServer(); return false;'
+        <input type='submit' name='<%$prefix%>delLdapServer'
                value='Delete Server'>
     </td>
     <td align='right' valign='top'> 
        <table border='0'>
-        <tr><td align='right' valign='top'>Base:</td><td align='left' valign='top'><input size=16 id='<%$prefix%>ldapBase'></td></tr>
-	<tr><td align='right' valign='top'>Filter:</td><td align='left' valign='top'><input size=16 id='<%$prefix%>ldapFilter'></td></tr>
-	<tr><td align='right' valign='top'>Password Field:</td><td align='left' valign='top'><input size=16 id='<%$prefix%>ldapPasswordField'></td></tr>
+        <tr><td align='right' valign='top'>Base:</td><td align='left' valign='top'><input size=16 
+		id='<%$prefix%>ldapBase'
+		onblur="ldap_onblur_ldapBase('<%$prefix%>');">
+	    </td></tr>
+	<tr><td align='right' valign='top'>Filter:</td><td align='left' valign='top'><input size=16 
+		id='<%$prefix%>ldapFilter'
+		onblur="ldap_onblur_ldapFilter('<%$prefix%>');">
+	    </td></tr>
+	<tr><td align='right' valign='top'>Password Field:</td><td align='left' valign='top'><input size=16 
+		id='<%$prefix%>ldapPasswordField'
+		onblur="ldap_onblur_ldapPassword('<%$prefix%>');">
+	    </td></tr>
         </table>
     </td>
 </tr>