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

Fix for bug 79933. Added some error messages when user enters invalid data into the

Browse Source 
directory server properties dialog
r=mohanb, sr=sspitzer, a=blizzard
This commit is contained in:
srilatha%netscape.com 2001-06-19 02:34:56 +00:00
parent 936d1b7a02
commit 96a84d6c9d
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
mailnews/addrbook/prefs/resources/content/pref-directory-add.js
View File

@ -131,6 +131,29 @@ function createUniqueServername()
gPref_string_desc += str[0];
}
}
function hasOnlyWhitespaces(string)
{
// get all the whitespace characters of string and assign them to str.
// string is not modified in this function
// returns true if string contains only whitespaces and/or tabs
var re = /[ \s]/g;
var str = string.match(re);
if (str && (str.length == string.length))
return true;
else
return false;
}
function hasCharacters(number)
{
var re = /[0-9]/g;
var num = number.match(re);
if(num && (num.length == number.length))
return false;
else
return true;
}
function onOK()
{
@ -159,8 +182,19 @@ function onOK()
var description = document.getElementById("description").value;
var hostname = document.getElementById("hostname").value;
var port = document.getElementById("port").value;
var results = document.getElementById("results").value;
var errorValue = null;
gPref_string_desc = description;
if (gPref_string_desc && hostname) {
if ((!gPref_string_desc) || hasOnlyWhitespaces(gPref_string_desc))
errorValue = "invalidName";
else if ((!hostname) || hasOnlyWhitespaces(hostname))
errorValue = "invalidHostname";
else if (port && hasCharacters(port))
errorValue = "invalidPortNumber";
else if (results && hasCharacters(results))
errorValue = "invalidResults";
if (!errorValue) {
pref_string_content = gPref_string_desc;
if (gCurrentDirectory && gCurrentDirectoryString)
{
@ -178,8 +212,10 @@ function onOK()
ldapUrl.host = hostname;
pref_string_content = document.getElementById("basedn").value;
ldapUrl.dn = pref_string_content;
pref_string_content = document.getElementById("port").value;
ldapUrl.port = pref_string_content;
if (!port)
ldapUrl.port = gPortNumber;
else
ldapUrl.port = port;
pref_string_content = document.getElementById("search").value;
ldapUrl.filter = pref_string_content;
if (document.getElementById("one").checked)
@ -191,11 +227,18 @@ function onOK()
}
pref_string_title = gPref_string_desc + ".uri";
gPrefInt.SetCharPref(pref_string_title, ldapUrl.spec);
pref_string_content = document.getElementById("results").value;
pref_string_content = results;
pref_string_title = gPref_string_desc + ".maxHits";
if (pref_string_content != gMaxHits) {
pref_string_title = gPref_string_desc + ".maxHits";
gPrefInt.SetIntPref(pref_string_title, pref_string_content);
}
else
{
try {
gPrefInt.ClearUserPref(pref_string_title);
}
catch(ex) {}
}
pref_string_title = gPref_string_desc + ".auth.enabled";
try{
pref_string_content = gPrefInt.GetBoolPref(pref_string_title);
@ -213,7 +256,7 @@ function onOK()
else
{
var addressBookBundle = document.getElementById("bundle_addressBook");
errorMsg = addressBookBundle.getString("errorMessage");
var errorMsg = addressBookBundle.getString(errorValue);
alert(errorMsg);
}

5
mailnews/addrbook/resources/locale/en-US/addressBook.properties
View File

@ -67,4 +67,7 @@ totalCardStatus=Total Cards in %1$S: %2$S
#LDAP directory stuff
#
directoriesListItemNone=None
errorMessage=Please enter valid information.
invalidName=Please enter a valid Name.
invalidHostname=Please enter a valid Hostname.
invalidPortNumber=Please enter a valid Port Number.
invalidResults=Please enter a valid number in the results field.