[Netpass-devel] NetPass/www/htdocs/OSSTemplate/js common.js,1.3,1.4 debug.js,1.11,1.12 ldap.js,1.1,1
Brought to you by:
jeffmurphy
Menu
▾
▴
[Netpass-devel] NetPass/www/htdocs/OSSTemplate/js common.js,1.3,1.4 debug.js,1.11,1.12 ldap.js,1.1,1.2 radius.js,1.1,1.2
|
From: jeff m. <jef...@us...> - 2005-06-23 20:21:27
|
Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4657/www/htdocs/OSSTemplate/js Modified Files: common.js debug.js ldap.js radius.js Log Message: bug fixes to userform, arp table searching (osx), ldap ui, auth.mhtml ui Index: debug.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/debug.js,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- debug.js 8 Jun 2005 16:44:38 -0000 1.11 +++ debug.js 23 Jun 2005 20:21:10 -0000 1.12 @@ -45,7 +45,8 @@ //return; } - if (DBGLEVEL) + if (DBGLEVEL) { dbgwin = window.open("about:blank", "DEBUGOUTPUT", - "resizable,width=400,height=400,scrollbars"); + "resizable,width=400,height=400,scrollbars"); + } } Index: ldap.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/ldap.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ldap.js 8 Jun 2005 16:35:42 -0000 1.1 +++ ldap.js 23 Jun 2005 20:21:10 -0000 1.2 @@ -1,13 +1,90 @@ // when the ldap server field changes, // do a submit to refresh the page +function ldap_xh_results_getLDAP(r, prefix) { + var RN = "ldap_xh_results_getLDAP"; + + var sf = document.getElementById(prefix + "ldapBase"); + if (!sf) return; + + var ra = r.split(/\s+/); + var i = 0; + while (i < ra.length && ra[i] != "OK" && ra[i] != "NOK") { i++ } + if (ra[i] == "OK") { + sf.value = ra[2]; + sf = document.getElementById(prefix + "ldapFilter"); + if (sf) sf.value = ra[3]; + sf = document.getElementById(prefix + "ldapPasswordField"); + if (sf) sf.value = ra[4]; + } else { + alert("failed to getSecret " + r); + } +} + +function ldap_xh_results_setLDAP(r, prefix) { + var RN = "ldap_xh_results_setLDAP"; + + var ra = r.split(/\s+/); + var i = 0; + while (i < ra.length && ra[i] != "OK" && ra[i] != "NOK") { i++ } + if (ra[i] == "OK") { + alert("LDAP setting changed"); + } else { + alert("failed to set LDAP setting " + r); + } +} + function ldap_onchange_ldapServer(prefix) { var RN = "ldap_onchange_ldapServer"; dbg (1, RN); var o = document.getElementById(prefix + 'ldapServer'); + var gotOne = false; for (var i = 1 ; i < o.options.length ; i++) { - if (o.options[i].selected) - document.forms[0].submit(); + if (o.options[i].selected) { + gotOne = true; + xh_post("/Admin/cmd/getLDAP.mhtml?server=" + + o.options[i].value, "ldap_xh_results_getLDAP", prefix); + } + } + if (!gotOne) ldap_clear_fields(prefix); +} + +function ldap_onblur_ldapBase(prefix) { + var RN = "ldap_onblur_ldapBase"; + dbg (1, RN); + var s = document.getElementById(prefix + 'ldapServer'); + var f = document.getElementById(prefix + 'ldapBase'); + if (f && s && (f.value != '') && (s.selectedIndex > 0)) { + xh_post("/Admin/cmd/setLDAP.mhtml?server=" + + s.options[s.selectedIndex].value + + "&base=" + f.value, + "ldap_xh_results_setLDAP", prefix); + } +} + +function ldap_onblur_ldapFilter(prefix) { + var RN = "ldap_onblur_ldapFilter"; + dbg (1, RN); + var s = document.getElementById(prefix + 'ldapServer'); + var f = document.getElementById(prefix + 'ldapFilter'); + if (f && s && (f.value != '') && (s.selectedIndex > 0)) { + xh_post("/Admin/cmd/setLDAP.mhtml?server=" + + s.options[s.selectedIndex].value + + "&filter=" + f.value, + "ldap_xh_results_setLDAP", prefix); + } +} + +function ldap_onblur_ldapPasswordField(prefix) { + var RN = "ldap_onblur_ldapPasswordField"; + dbg (1, RN); + var s = document.getElementById(prefix + 'ldapServer'); + var f = document.getElementById(prefix + 'ldapPasswordField'); + if (f && s && (f.value != '') && (s.selectedIndex > 0)) { + xh_post("/Admin/cmd/setLDAP.mhtml?server=" + + s.options[s.selectedIndex].value + + "&passwordField=" + f.value, + "ldap_xh_results_setLDAP", prefix); } } @@ -20,7 +97,7 @@ } function ldap_onblur_addServer(prefix) { - var RN = "ldap_onfocus_addServer"; + var RN = "ldap_onblur_addServer"; dbg (1, RN); var o = document.getElementById(prefix + 'ldapAddServer'); var l = document.getElementById(prefix + 'ldapServer'); Index: radius.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/radius.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- radius.js 8 Jun 2005 16:35:42 -0000 1.1 +++ radius.js 23 Jun 2005 20:21:10 -0000 1.2 @@ -1,13 +1,64 @@ // when the radius server field changes, // do a submit to refresh the page +function radius_xh_results_getSecret(r, prefix) { + var RN = "radius_xh_results_getSecret"; + + var sf = document.getElementById(prefix + "radiusSecret"); + if (!sf) return; + + var ra = r.split(/\s+/); + var i = 0; + while (i < ra.length && ra[i] != "OK" && ra[i] != "NOK") { i++ } + if (ra[i] == "OK") { + sf.value = ra[2]; + } else { + alert("failed to getSecret " + r); + } +} + +function radius_xh_results_setSecret(r, prefix) { + var RN = "radius_xh_results_setSecret"; + + var ra = r.split(/\s+/); + var i = 0; + while (i < ra.length && ra[i] != "OK" && ra[i] != "NOK") { i++ } + if (ra[i] == "OK") { + alert("secret changed"); + } else { + alert("failed to setSecret " + r); + } +} + function radius_onchange_radiusServer(prefix) { var RN = "radius_onchange_radiusServer"; dbg (1, RN); var o = document.getElementById(prefix + 'radiusServer'); + var gotOne = false; for (var i = 1 ; i < o.options.length ; i++) { - if (o.options[i].selected) - document.forms[0].submit(); + if (o.options[i].selected) { + gotOne = true; + xh_post("/Admin/cmd/getRadiusSecret.mhtml?server=" + + o.options[i].value, "radius_xh_results_getSecret", prefix); + } + } + if (!gotOne) { + var sf = document.getElementById(prefix + "radiusSecret"); + sf.value = ''; + } +} + +function radius_onblur_radiusSecret(prefix) { + var RN = "radius_onblur_radiusSecret"; + dbg (1, RN); + var sc = document.getElementById(prefix + 'radiusSecret'); + var sv = document.getElementById(prefix + 'radiusServer'); + + if ( sc && sv && (sc.value != '') && (sv.selectedIndex > 0) ) { + xh_post("/Admin/cmd/setRadiusSecret.mhtml?server=" + + sv.options[sv.selectedIndex].value + + "&secret=" + sc.value, + "radius_xh_results_setSecret", prefix); } } @@ -34,8 +85,8 @@ o.value = 'Add Server...'; } -function radius_onclick_delServer() { - var RN = "radius_onfocus_addServer"; +function radius_onclick_delServer(prefix) { + var RN = "radius_onclick_delServer"; dbg (1, RN); var o = document.getElementById(prefix + 'radiusServer'); if (o) { @@ -50,3 +101,4 @@ var o = document.getElementById(prefix + 'radiusSecret'); if (o) o.value = ''; } + Index: common.js =================================================================== RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/common.js,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- common.js 8 Jun 2005 16:35:42 -0000 1.3 +++ common.js 23 Jun 2005 20:21:10 -0000 1.4 @@ -1,4 +1,13 @@ +function xh_post(url, callback, arg) { + xmlhttp.open("GET", url + "&printable=2"); + xmlhttp.onreadystatechange = + eval("x = function() {if (xmlhttp.readyState == 4) {" + + callback + "(xmlhttp.responseText, " + + '"' + arg + '"' + ");}}"); + xmlhttp.send(null); +} + function adjust_onClick(obj, fn) { if (browserType_IE) { obj.onclick = eval("x=function(e){"+fn+"}"); @@ -78,6 +87,7 @@ var acl = document.getElementById(oname); if (acl) { + //acl.selectedIndex = -1; for(var i = 0 ; i < acl.options.length ; i++) { if (item) { if (item == acl.options[i].value) @@ -85,7 +95,6 @@ } else { acl.options[i].selected = false; } - acl.selectedIndex = -1; } } else { dbg (1, RN + ": error cant find " + oname + " object"); @@ -95,9 +104,10 @@ function highLightList(oname, item) { var RN = "highLightList"; - + dbg(1, RN + "(" + oname + ", " + item + ")" ); var acl = document.getElementById(oname); if (acl) { + acl.selectedIndex = -1; for(var i = 1 ; i < acl.options.length ; i++) { if (item) { if (acl.options[i].value == item) @@ -106,7 +116,6 @@ else { acl.options[i].selected = true; } - acl.selectedIndex = -1; } } else { dbg (1, RN + ": error cant find " + oname + " object"); @@ -140,3 +149,4 @@ dbg (1, RN + ": error cant find " + oname + " object"); } } + |
