Merge pull request #568 in ZP/z-push from...

Merge pull request #568 in ZP/z-push from feature/ZP-1258-use-pr_ec_imap_email-to-get-rfc822 to develop

* commit 'd2af6bfe':
  ZP-1258 Use PR_EC_IMAP_EMAIL to get RFC822 data.

src/backend/kopano/mapi/mapitags.php

@@ -1136,6 +1136,12 @@ define('PR_EC_STATS_SESSION_LOCKED'                   ,mapi_prop_tag(PT_BOOLEAN,
 define('PR_EC_STATS_SESSION_BUSYSTATES'               ,mapi_prop_tag(PT_MV_STRING8,  PR_EC_BASE+0x47));
 define('PR_EC_COMPANY_NAME'                           ,mapi_prop_tag(PT_STRING8,     PR_EC_BASE+0x48));
 
+/* kopano specific properties for optimization of imap functionality */
+define('PR_EC_IMAP_EMAIL'                             ,mapi_prop_tag(PT_BINARY,      PR_EC_BASE+0x8C)); // the complete rfc822 email
+define('PR_EC_IMAP_EMAIL_SIZE'                        ,mapi_prop_tag(PT_LONG,        PR_EC_BASE+0x8D));
+define('PR_EC_IMAP_BODY'                              ,mapi_prop_tag(PT_STRING8,     PR_EC_BASE+0x8E)); // simplified bodystructure (mostly unused by clients)
+define('PR_EC_IMAP_BODYSTRUCTURE'                     ,mapi_prop_tag(PT_STRING8,     PR_EC_BASE+0x8F)); // extended bodystructure (often used by clients)
+
 /* user features */
 define('PR_EC_ENABLED_FEATURES'                       ,mapi_prop_tag(PT_MV_TSTRING,  PR_EC_BASE+0xB3));
 define('PR_EC_ENABLED_FEATURES_A'                     ,mapi_prop_tag(PT_MV_STRING8,  PR_EC_BASE+0xB3));

src/backend/kopano/mapiprovider.php

@@ -2533,32 +2533,37 @@ class MAPIProvider {
      * @return boolean
      */
     private function imtoinet($mapimessage, &$message) {
-        if (function_exists("mapi_inetmapi_imtoinet")) {
+        $mapiEmail = mapi_getprops($mapimessage, array(PR_EC_IMAP_EMAIL));
+        $stream = false;
+        if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
+            $stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
+            ZLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
+        }
+        else {
             $addrbook = $this->getAddressbook();
             $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, array('use_tnef' => -1));
-
-            if (is_resource($stream)) {
-                $mstreamstat = mapi_stream_stat($stream);
-                $streamsize = $mstreamstat["cb"];
-                if (isset($streamsize)) {
-                    if (Request::GetProtocolVersion() >= 12.0) {
-                        if (!isset($message->asbody))
-                            $message->asbody = new SyncBaseBody();
-                        $message->asbody->data = MAPIStreamWrapper::Open($stream);
-                        $message->asbody->estimatedDataSize = $streamsize;
-                        $message->asbody->truncated = 0;
-                    }
-                    else {
-                        $message->mimedata = MAPIStreamWrapper::Open($stream);
-                        $message->mimesize = $streamsize;
-                        $message->mimetruncated = 0;
-                    }
-                    unset($message->body, $message->bodytruncated);
-                    return true;
+        }
+        if (is_resource($stream)) {
+            $mstreamstat = mapi_stream_stat($stream);
+            $streamsize = $mstreamstat["cb"];
+            if (isset($streamsize)) {
+                if (Request::GetProtocolVersion() >= 12.0) {
+                    if (!isset($message->asbody))
+                        $message->asbody = new SyncBaseBody();
+                    $message->asbody->data = MAPIStreamWrapper::Open($stream);
+                    $message->asbody->estimatedDataSize = $streamsize;
+                    $message->asbody->truncated = 0;
+                }
+                else {
+                    $message->mimedata = MAPIStreamWrapper::Open($stream);
+                    $message->mimesize = $streamsize;
+                    $message->mimetruncated = 0;
                 }
+                unset($message->body, $message->bodytruncated);
+                return true;
             }
-            ZLog::Write(LOGLEVEL_ERROR, sprintf("MAPIProvider->imtoinet(): got no stream or content from mapi_inetmapi_imtoinet()"));
         }
+        ZLog::Write(LOGLEVEL_ERROR, "MAPIProvider->imtoinet(): got no stream or content from mapi_inetmapi_imtoinet()");
 
         return false;
     }