From 72c557165944d10f46f01f54509a54624478942a Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Fri, 8 Mar 2002 21:16:15 +0000
Subject: [PATCH] fix for #128035.  we mixed up home web page and work web page
 for LDAP, and LDIF import and export.  initial patch by rjc and john.marmion.

r=john.marmion,racham sr=bienvenu a=asa
---
 mailnews/addrbook/public/nsIAbCard.idl       | 6 ++++++
 mailnews/addrbook/public/nsIAddrDatabase.idl | 2 ++
 mailnews/addrbook/src/nsAbLDAPProperties.cpp | 4 ++--
 mailnews/addrbook/src/nsAddressBook.cpp      | 8 ++++----
 mailnews/import/text/src/nsTextAddress.cpp   | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mailnews/addrbook/public/nsIAbCard.idl b/mailnews/addrbook/public/nsIAbCard.idl
index f77421517ea9..8912a5c5c56d 100644
--- a/mailnews/addrbook/public/nsIAbCard.idl
+++ b/mailnews/addrbook/public/nsIAbCard.idl
@@ -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;
diff --git a/mailnews/addrbook/public/nsIAddrDatabase.idl b/mailnews/addrbook/public/nsIAddrDatabase.idl
index ae30268a7d7b..74dede01020d 100644
--- a/mailnews/addrbook/public/nsIAddrDatabase.idl
+++ b/mailnews/addrbook/public/nsIAddrDatabase.idl
@@ -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"
diff --git a/mailnews/addrbook/src/nsAbLDAPProperties.cpp b/mailnews/addrbook/src/nsAbLDAPProperties.cpp
index f6e896054c56..cf74d47ca24e 100644
--- a/mailnews/addrbook/src/nsAbLDAPProperties.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPProperties.cpp
@@ -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"},
diff --git a/mailnews/addrbook/src/nsAddressBook.cpp b/mailnews/addrbook/src/nsAddressBook.cpp
index 26c759621933..6b86bc053048 100644
--- a/mailnews/addrbook/src/nsAddressBook.cpp
+++ b/mailnews/addrbook/src/nsAddressBook.cpp
@@ -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'
 
diff --git a/mailnews/import/text/src/nsTextAddress.cpp b/mailnews/import/text/src/nsTextAddress.cpp
index a05dd4944dc7..688e041a0eca 100644
--- a/mailnews/import/text/src/nsTextAddress.cpp
+++ b/mailnews/import/text/src/nsTextAddress.cpp
@@ -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'