ZP-471 #comment meeting requests now use the correct messageclass...

ZP-471 #comment meeting requests now use the correct messageclass ("urn:content-classes:calendarmessage")

git-svn-id: https://z-push.org/svn/z-push/trunk@1880 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/zarafa/mapiprovider.php

@@ -624,6 +624,7 @@ class MAPIProvider {
                     $req->processMeetingCancellation();
                 }
             }
+            $message->contentclass = DEFAULT_CALENDAR_CONTENTCLASS;
         }
 
         // Add attachments
@@ -746,7 +747,7 @@ class MAPIProvider {
         //TODO contentclass and nativebodytype and internetcpid
         if (!isset($message->internetcpid)) $message->internetcpid = (defined('STORE_INTERNET_CPID')) ? constant('STORE_INTERNET_CPID') : INTERNET_CPID_WINDOWS1252;
         $this->setFlag($mapimessage, $message);
-        $message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
+        if (!isset($message->contentclass)) $message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
         if (!isset($message->nativebodytype)) $message->nativebodytype = $this->getNativeBodyType($messageprops);
 
         // reply, reply to all, forward flags

src/lib/core/zpushdefs.php

@@ -1025,6 +1025,7 @@ define("SYNC_FLAGSTATUS_COMPLETE", 1);
 define("SYNC_FLAGSTATUS_ACTIVE", 2);
 
 define("DEFAULT_EMAIL_CONTENTCLASS", "urn:content-classes:message");
+define("DEFAULT_CALENDAR_CONTENTCLASS", "urn:content-classes:calendarmessage");
 
 define("SYNC_MAIL_LASTVERB_UNKNOWN", 0);
 define("SYNC_MAIL_LASTVERB_REPLYSENDER", 1);

src/lib/syncobjects/syncmail.php

@@ -164,7 +164,7 @@ class SyncMail extends SyncObject {
                                                                                     self::STREAMER_ARRAY    => SYNC_AIRSYNCBASE_ATTACHMENT);
 
             $mapping[SYNC_POOMMAIL_CONTENTCLASS]                        = array (   self::STREAMER_VAR      => "contentclass",
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF     => array(DEFAULT_EMAIL_CONTENTCLASS) ));
+                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF     => array(DEFAULT_EMAIL_CONTENTCLASS, DEFAULT_CALENDAR_CONTENTCLASS) ));
 
             $mapping[SYNC_POOMMAIL_FLAG]                                = array (   self::STREAMER_VAR      => "flag",
                                                                                     self::STREAMER_TYPE     => "SyncMailFlags",