Changeset 86 for Mulberry/branches/v4.1d1/Sources_Common/Mail/INET_Clients/IMSP/CIMSPClient.cp

Timestamp:

07/09/07 10:02:18 (2 years ago)

Author:

daboo

Message:

Some 4.1 changes. Mostly vCard/CardDAV and CalDAV scheduling support.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Mail/INET_Clients/IMSP/CIMSPClient.cp (modified) (14 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Mail/INET_Clients/IMSP/CIMSPClient.cp

@@ -21 +21 @@
 
 #include "CAdbkACL.h"
+#include "CAddressBook.h"
 #include "CCharSpecials.h"
 #include "CGeneralException.h"
@@ -27 +28 @@
 #include "CINETCommon.h"
 #include "CMailControl.h"
-#include "CRemoteAddressBook.h"
 #include "CRFC822.h"
 #include "CStatusWindow.h"
 #include "CStringUtils.h"
+
+#include "CVCardMapper.h"
+
+#include "CVCardAddressBook.h"
+#include "CVCardVCard.h"
 
 #if __dest_os == __mac_os || __dest_os == __mac_os_x
@@ -217 +222 @@
         mAuthAnonAllowed = mLastResponse.CheckUntagged(cIMAP_AUTHANON, true);
         mSTARTTLSAllowed = mLastResponse.CheckUntagged(cSTARTTLS, true);
+        
+        // IMSP always has ACLs
+        GetAdbkOwner()->SetHasACL(true);
 }
 
@@ -381 +389 @@
 // Operations on address books
 
-// Find all adbks below this path
-void CIMSPClient::_FindAllAdbks(const cdstring& path)
+void CIMSPClient::_ListAddressBooks(CAddressBook* root)
 {
         // Must add wildcard and quote value
-        cdstring qvalue = path;
+        cdstring qvalue = (root->IsProtocol() ? cdstring::null_str : root->GetName());
         qvalue += cWILDCARD;
 
@@ -396 +403 @@
 }
 
+// Find all adbks below this path
+void CIMSPClient::_FindAllAdbks(const cdstring& path)
+{
+        // Must add wildcard and quote value
+        cdstring qvalue = path;
+        qvalue += cWILDCARD;
+
+        // Send ADDRESSBOOK message to server
+        INETStartSend("Status::IMSP::AddressBooks", "Error::IMSP::OSErrAddressBooks", "Error::IMSP::NoBadAddressBooks");
+        INETSendString(cADDRESSBOOK);
+        INETSendString(cSpace);
+        INETSendString(qvalue, eQueueProcess);
+        INETFinishSend();
+}
+
 // Create adbk
 void CIMSPClient::_CreateAdbk(const CAddressBook* adbk)
@@ -405 +427 @@
         INETSendString(adbk->GetName(), eQueueProcess);
         INETFinishSend();
+}
+
+bool CIMSPClient::_AdbkChanged(const CAddressBook* adbk)
+{
+        // No way to tell if there have been changes on the server, so return true to force entire sync
+        return true;
 }
 
@@ -431 +459 @@
 }
 
+void CIMSPClient::_SizeAdbk(CAddressBook* adbk)
+{
+        // Does nothing
+}
+
 // Operations with addresses
+
+// Find all addresses in adbk
+void CIMSPClient::_ReadFullAddressBook(CAddressBook* adbk)
+{
+        _FindAllAddresses(adbk);
+}
+
+// Write all addresses in adbk
+void CIMSPClient::_WriteFullAddressBook(CAddressBook* adbk)
+{
+        
+}
 
 // Find all addresses in adbk
@@ -615 +660 @@
                 }
 
+                // Calendar
+                temp = addr->GetCalendar();
+                temp.ConvertFromOS();
+                if (!temp.empty())
+                {
+                        INETSendString(cSpace);
+                        INETSendString(cADDRESS_CALENDAR);
+                        INETSendString(cSpace);
+                        INETSendString(temp, eQueueProcess);
+                }
+                
                 // Company
                 temp = addr->GetCompany();
@@ -1369 +1425 @@
         }
 
-        if (noselect)
-        {
-                // Add name only to list
-                cdstring* hier_name = new cdstring(adbk_name);
-                GetAdbkOwner()->GetAdbkList()->push_back(hier_name, noinferiors);
-        }
-        else
-        {
                 // Add adress book to list
-                CRemoteAddressBook* adbk = new CRemoteAddressBook(GetAdbkOwner(), adbk_name);
-                GetAdbkOwner()->GetAdbkList()->push_back(adbk, noinferiors);
-        }
+        CAddressBook* adbk = new CAddressBook(GetAdbkOwner(), GetAdbkOwner()->GetStoreRoot(), !noselect, !noinferiors, adbk_name);
+        GetAdbkOwner()->GetStoreRoot()->AddChildHierarchy(adbk);
         delete adbk_name;
 
@@ -1416 +1463 @@
         char* email = NULL;
         char* members = NULL;
+        char* calendar = NULL;
         char* company = NULL;
         char* address = NULL;
@@ -1437 +1485 @@
                         eCodeEmail,
                         eCodeMembers,
+                        eCodeCalendar,
                         eCodeCompany,
                         eCodeAddress,
@@ -1458 +1507 @@
                 else if (::strcmpnocase(p, cADDRESS_MEMBERS) == 0)
                         code = eCodeMembers;
+                else if (::strcmpnocase(p, cADDRESS_CALENDAR) == 0)
+                        code = eCodeCalendar;
                 else if (::strcmpnocase(p, cADDRESS_COMPANY) == 0)
                         code = eCodeCompany;
@@ -1494 +1545 @@
                 else if (code == eCodeMembers)
                         members = value;
+                else if (code == eCodeCalendar)
+                        calendar = value;
                 else if (code == eCodeCompany)
                         company = value;
@@ -1588 +1641 @@
 
                 // Create address and add to address book or search list
-                CAdbkAddress* addr = new CAdbkAddress(name, email, name, alias, company, temp_addr, phone_work, phone_home, fax, urls, notes);
+                CAdbkAddress* addr = new CAdbkAddress(name, email, name, alias, calendar, company, temp_addr, phone_work, phone_home, fax, urls, notes);
                 if (mSearchMode)
                         mSearchResults->push_back(addr);
                 else if (mActionAdbk)
+                {
                         mActionAdbk->GetAddressList()->push_back(addr);
+                        if (mActionAdbk->GetVCardAdbk() != NULL)
+                                mActionAdbk->GetVCardAdbk()->AddCard(vcardstore::GenerateVCard(mActionAdbk->GetVCardAdbk()->GetRef(), addr));
+                }
         }