Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into...

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-556-having-access-to-the-public-folder

src/backend/zarafa/mapiprovider.php

@@ -2381,15 +2381,20 @@ class MAPIProvider {
         }
 
         $stream = mapi_openproperty($mapimessage, $property, IID_IStream, 0, 0);
-        $stat = mapi_stream_stat($stream);
-        $streamsize = $stat['cb'];
+        if ($stream) {
+            $stat = mapi_stream_stat($stream);
+            $streamsize = $stat['cb'];
+        }
+        else {
+            $streamsize = 0;
+        }
 
         //set the properties according to supported AS version
         if (Request::GetProtocolVersion() >= 12.0) {
             $message->asbody = new SyncBaseBody();
             $message->asbody->type = $bpReturnType;
             if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
-                $body = mapi_stream_read($stream, $streamsize);
+                $body = $this->mapiReadStream($stream, $streamsize);
                 $message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
             }
             elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
@@ -2398,7 +2403,7 @@ class MAPIProvider {
                     $message->asbody->data = MAPIStreamWrapper::Open($stream);
                 }
                 else {
-                    $body = mapi_stream_read($stream, $streamsize);
+                    $body = $this->mapiReadStream($stream, $streamsize);
                     $message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body));
                 }
             }
@@ -2408,7 +2413,7 @@ class MAPIProvider {
             $message->asbody->estimatedDataSize = $streamsize;
         }
         else {
-            $body = mapi_stream_read($stream, $streamsize);
+            $body = $this->mapiReadStream($stream, $streamsize);
             $message->body = str_replace("\n","\r\n", w2u(str_replace("\r", "", $body)));
             $message->bodysize = $streamsize;
             $message->bodytruncated = 0;
@@ -2417,6 +2422,22 @@ class MAPIProvider {
         return true;
     }
 
+    /**
+     * Reads from a mapi stream, if it's set. If not, returns an empty string.
+     *
+     * @param resource $stream
+     * @param int $size
+     *
+     * @access private
+     * @return string
+     */
+    private function mapiReadStream($stream, $size) {
+        if (!$stream || $size == 0) {
+            return "";
+        }
+        return mapi_stream_read($stream, $streamsize);
+    }
+
     /**
      * A wrapper for mapi_inetmapi_imtoinet function
      *

src/backend/zarafa/mapistreamwrapper.php

@@ -75,8 +75,13 @@ class MAPIStreamWrapper {
         $this->mapistream = $contextOptions[self::PROTOCOL]['stream'];
 
         // get the data length from mapi
-        $stat = mapi_stream_stat($this->mapistream);
-        $this->streamlength = $stat["cb"];
+        if ($this->mapistream) {
+            $stat = mapi_stream_stat($this->mapistream);
+            $this->streamlength = $stat["cb"];
+        }
+        else {
+            $this->streamlength = 0;
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIStreamWrapper::stream_open(): initialized mapistream: %s streamlength: %d", $this->mapistream, $this->streamlength));
 
@@ -97,7 +102,12 @@ class MAPIStreamWrapper {
         // read 4 additional bytes from the stream so we can always truncate correctly
         if ($this->toTruncate)
             $len += 4;
-        $data = mapi_stream_read($this->mapistream, $len);
+        if ($this->mapistream) {
+            $data = mapi_stream_read($this->mapistream, $len);
+        }
+        else {
+            $data = "";
+        }
         $this->position += strlen($data);
 
         // we need to truncate UTF8 compatible if ftruncate() was called