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

Merge pull request #640 in ZP/z-push from bugfix/ZP-1345-own-private-items-stripped-when-folder-is-in-additionalfolders to develop

* commit '7ce9d624':
  ZP-1345 Optimize the check for shared and private messages.
  ZP-1345 Own private items stripped when folder is in $additionalFolders.

src/backend/kopano/mapiutils.php

@@ -364,12 +364,15 @@ class MAPIUtils {
      */
     public static function IsMessageSharedAndPrivate($folderid, $mapimessage) {
         $sensitivity = mapi_getprops($mapimessage, array(PR_SENSITIVITY));
-        $sharedUser = ZPush::GetAdditionalSyncFolderStore(bin2hex($folderid));
-        if ($sharedUser != false && $sharedUser != 'SYSTEM' && isset($sensitivity[PR_SENSITIVITY]) && $sensitivity[PR_SENSITIVITY] >= SENSITIVITY_PRIVATE) {
+        if (isset($sensitivity[PR_SENSITIVITY]) && $sensitivity[PR_SENSITIVITY] >= SENSITIVITY_PRIVATE) {
+            $hexFolderid = bin2hex($folderid);
+            $sharedUser = ZPush::GetAdditionalSyncFolderStore($hexFolderid);
+            $shortId = ZPush::GetDeviceManager()->GetFolderIdForBackendId($hexFolderid);
+            if (substr($shortId, 0, 1) != DeviceManager::FLD_ORIGIN_USER && $sharedUser != false && $sharedUser != 'SYSTEM') {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIUtils->IsMessageSharedAndPrivate(): Message is in shared store '%s' and marked as private", $sharedUser));
                 return true;
             }
-
+        }
         return false;
     }