Commit 5220fd16 authored by Manfred Kutas's avatar Manfred Kutas

ZP-1357 Simplify check if the user is impersonated for folder origin.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 1c989db0
...@@ -990,7 +990,7 @@ class MAPIProvider { ...@@ -990,7 +990,7 @@ class MAPIProvider {
$folder->BackendId = bin2hex($folderprops[PR_SOURCE_KEY]); $folder->BackendId = bin2hex($folderprops[PR_SOURCE_KEY]);
$folderOrigin = DeviceManager::FLD_ORIGIN_USER; $folderOrigin = DeviceManager::FLD_ORIGIN_USER;
if (ZPush::GetBackend()->GetImpersonatedUser() && ZPush::GetBackend()->GetImpersonatedUser() != ZPush::GetBackend()->GetMainUser()) { if (ZPush::GetBackend()->GetImpersonatedUser()) {
$folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED; $folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
} }
$folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]); $folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment