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

Merge pull request #657 in ZP/z-push from bugfix/ZP-1361-folder-created-in-impersonated-store-is-not-fld_origin_impersonated to develop

* commit '2068695f':
  ZP-1361 Create FLD_ORIGIN_IMPERSONATED type folder in impersonated store.

src/backend/kopano/importer.php

@@ -688,7 +688,11 @@ class ImportChangesICS implements IImportChanges {
             $props =  mapi_getprops($newfolder, array(PR_SOURCE_KEY));
             if (isset($props[PR_SOURCE_KEY])) {
                 $folder->BackendId = bin2hex($props[PR_SOURCE_KEY]);
-                $folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, DeviceManager::FLD_ORIGIN_USER, $folder->displayname);
+                $folderOrigin = DeviceManager::FLD_ORIGIN_USER;
+                if (ZPush::GetBackend()->GetImpersonatedUser()) {
+                    $folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
+                }
+                $folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folder->displayname);
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Created folder '%s' with id: '%s' backendid: '%s'", $displayname, $folder->serverid, $folder->BackendId));
                 return $folder;
             }