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

fix for #128035. we mixed up home web page and work web page

Browse Source 
for LDAP, and LDIF import and export.  initial patch
by rjc and john.marmion.

r=john.marmion,racham sr=bienvenu a=asa
This commit is contained in:
sspitzer%netscape.com 2002-03-08 21:16:15 +00:00
parent 62c329115a
commit 72c5571659
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/addrbook/public/nsIAbCard.idl
View File

@ -73,7 +73,13 @@ interface nsIAbCard : nsISupports {
attribute wstring jobTitle;
attribute wstring department;
attribute wstring company;
/**
* webPage1 is work web page
*/
attribute wstring webPage1;
/**
* webPage2 is home web page
*/
attribute wstring webPage2;
attribute wstring birthYear;
attribute wstring birthMonth;

2
mailnews/addrbook/public/nsIAddrDatabase.idl
View File

@ -80,7 +80,9 @@
#define kJobTitleColumn "JobTitle"
#define kDepartmentColumn "Department"
#define kCompanyColumn "Company"
// webPage1 is work web page
#define kWebPage1Column "WebPage1"
// webPage2 is home web page
#define kWebPage2Column "WebPage2"
#define kBirthYearColumn "BirthYear"
#define kBirthMonthColumn "BirthMonth"

4
mailnews/addrbook/src/nsAbLDAPProperties.cpp
View File

@ -150,9 +150,9 @@ static MozillaLdapPropertyRelation mozillaLdapPropertyTable[] =
{MozillaProperty_String, "WorkCountry", "countryname"},
// ?
{MozillaProperty_String, "WebPage1", "homeurl"},
{MozillaProperty_String, "WebPage1", "workurl"},
// ?
{MozillaProperty_String, "WebPage2", "workurl"},
{MozillaProperty_String, "WebPage2", "homeurl"},
// ?
{MozillaProperty_String, "BirthYear", "birthyear"},

8
mailnews/addrbook/src/nsAddressBook.cpp
View File

@ -146,8 +146,8 @@ static ExportAttributesTableStruct EXPORT_ATTRIBUTES_TABLE[] = {
{kJobTitleColumn, "title", PR_TRUE},
{kDepartmentColumn, "ou", PR_TRUE},
{kCompanyColumn, "o", PR_TRUE},
{kWebPage1Column, "homeurl", PR_TRUE},
{kWebPage2Column, "workurl", PR_TRUE},
{kWebPage1Column, "workurl", PR_TRUE},
{kWebPage2Column, "homeurl", PR_TRUE},
{kBirthYearColumn, nsnull, PR_TRUE},
{kBirthMonthColumn, nsnull, PR_TRUE},
{kBirthDayColumn, nsnull, PR_TRUE},
@ -963,7 +963,7 @@ void AddressBookParser::AddLdifColToDatabase(nsIMdbRow* newRow, char* typeSlot,
mDatabase->AddHomePhone(newRow, column.get());
else if ( kNotFound != colType.Find("homeurl") )
mDatabase->AddWebPage1(newRow, column.get());
mDatabase->AddWebPage2(newRow, column.get());
break; // 'h'
case 'i':
@ -1171,7 +1171,7 @@ void AddressBookParser::AddLdifColToDatabase(nsIMdbRow* newRow, char* typeSlot,
case 'w':
if ( kNotFound != colType.Find("workurl") )
mDatabase->AddWebPage2(newRow, column.get());
mDatabase->AddWebPage1(newRow, column.get());
break; // 'w'

4
mailnews/import/text/src/nsTextAddress.cpp
View File

@ -1102,7 +1102,7 @@ void nsTextAddress::AddLdifColToDatabase(nsIMdbRow* newRow, char* typeSlot, char
else if (colType.Equals("homepostaladdress") )
m_database->AddHomeAddress(newRow, column.get());
else if (colType.Equals("homeurl") )
m_database->AddWebPage1(newRow, column.get());
m_database->AddWebPage2(newRow, column.get());
break; // 'h'
case 'i':
@ -1204,7 +1204,7 @@ void nsTextAddress::AddLdifColToDatabase(nsIMdbRow* newRow, char* typeSlot, char
case 'w':
if ( colType.Equals("workurl") )
m_database->AddWebPage2(newRow, column.get());
m_database->AddWebPage1(newRow, column.get());
break; // 'w'