Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checkin for bug 121332. Fix implementation for getLDAPAttributes() so it correctly calls the user callback processLDAPValues(). r=dmose, sr=alecf.

Browse Source
This commit is contained in:
bnesse%netscape.com 2002-06-12 18:58:11 +00:00
parent 10a7b9cd05
commit c5f8724fb9
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
extensions/pref/autoconfig/src/prefcalls.js
View File

@ -71,7 +71,7 @@ function pref(prefName, value) {
}
}
catch(e) {
displayError("pref failed with error: " + e);
displayError("pref", e);
}
}
@ -92,7 +92,7 @@ function defaultPref(prefName, value) {
}
}
catch(e) {
displayError("defaultPref failed with error: " + e);
displayError("defaultPref", e);
}
}
@ -109,7 +109,7 @@ function lockPref(prefName, value) {
prefBranch.lockPref(prefName);
}
catch(e) {
displayError("lockPref failed with error: " + e);
displayError("lockPref", e);
}
}
@ -121,7 +121,7 @@ function unlockPref(prefName) {
prefBranch.unlockPref(prefName);
}
catch(e) {
displayError("unlockPref failed with error: " + e);
displayError("unlockPref", e);
}
}
@ -145,7 +145,7 @@ function getPref(prefName) {
}
}
catch(e) {
displayError("getPref failed with error: " + e);
displayError("getPref", e);
}
}
@ -159,10 +159,10 @@ function getLDAPAttributes(host, base, filter, attribs) {
+ "?sub?" + filter;
var ldapquery = Components.classes[LDAPSyncQueryContractID]
.createInstance(nsILDAPSyncQuery);
return ldapquery.getQueryResults(url);
processLDAPValues(ldapquery.getQueryResults(url)); // user supplied method
}
catch(e) {
displayError("getLDAPAttibutes failed with error: " + e);
displayError("getLDAPAttibutes", e);
}
}
@ -187,20 +187,24 @@ function getLDAPValue(str, key) {
return str.substring(start_pos, end_pos);
}
catch(e) {
displayError("getLDAPValue failed with error: " + e);
displayError("getLDAPValue", e);
}
}
function displayError(message) {
function displayError(funcname, message) {
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
if (promptService) {
title = "AutoConfig Alert";
err = "Netscape.cfg/AutoConfig failed. Please Contact your system administrator \n Error Message: " + message;
promptService.alert(null, title, err);
}
try {
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
var bundle = Components.classes["@mozilla.org/intl/stringbundle;1"]
.getService(Components.interfaces.nsIStringBundleService)
.createBundle("chrome://autoconfig/locale/autoconfig.properties");
var title = bundle.GetStringFromName("autoConfigTitle");
var msg = bundle.formatStringFromName("autoConfigMsg", [funcname], 1);
promptService.alert(null, title, msg + " " + message);
}
catch(e) { }
}
function getenv(name) {
@ -210,7 +214,7 @@ function getenv(name) {
return currentProcess.getEnvironment(name);
}
catch(e) {
displayError("getEnvironment failed with error: " + e);
displayError("getEnvironment", e);
}
}