Changeset 86 for Mulberry/branches/v4.1d1/Sources_Common/HTTP/WebDAVClient/CWebDAVACL.cpp

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/HTTP/WebDAVClient/CWebDAVACL.cpp (modified) (3 diffs)

Mulberry/branches/v4.1d1/Sources_Common/HTTP/WebDAVClient/CWebDAVACL.cpp

@@ -34 +34 @@
 using namespace webdav; 
 
+CWebDAVACL::CWebDAVACL(CWebDAVSession* session, const cdstring& ruri, const CAdbkACLList* acls) :
+        CWebDAVRequestResponse(session, eRequest_ACL, ruri)
+{
+        mAdbkACLs = acls;
+        mCalACLs = NULL;
+
+        InitRequestData();
+}
+
 CWebDAVACL::CWebDAVACL(CWebDAVSession* session, const cdstring& ruri, const CCalendarACLList* acls) :
         CWebDAVRequestResponse(session, eRequest_ACL, ruri)
 {
-        mACLs = acls;
+        mAdbkACLs = NULL;
+        mCalACLs = acls;
 
         InitRequestData();
@@ -87 +97 @@
         
         // Do for each ACL
-        for(CCalendarACLList::const_iterator iter = mACLs->begin(); iter != mACLs->end(); iter++)
+        if (mAdbkACLs != NULL)
+        {
+                for(CAdbkACLList::const_iterator iter = mAdbkACLs->begin(); iter != mAdbkACLs->end(); iter++)
+                {
+                        // Cannot do if change not allowed
+                        if (!(*iter).CanChange())
+                                continue;
+                        
+                        // <DAV:ace> element
+                        (*iter).GenerateACE(&xmldoc, acl, static_cast<const CWebDAVSession*>(GetSession())->HasDAVVersion(CWebDAVSession::eCyrusoftInheritable));
+                }
+        }
+        if (mCalACLs != NULL)
+        {
+                for(CCalendarACLList::const_iterator iter = mCalACLs->begin(); iter != mCalACLs->end(); iter++)
         {
                 // Cannot do if change not allowed
@@ -95 +119 @@
                 // <DAV:ace> element
                 (*iter).GenerateACE(&xmldoc, acl, static_cast<const CWebDAVSession*>(GetSession())->HasDAVVersion(CWebDAVSession::eCyrusoftInheritable));
+                }
         }