Commit d7241581 authored by Sebastian Kummer's avatar Sebastian Kummer

ZO-29 Don't really fail if backend can't Setup the KOE_GAB_STORE. Return

the other folders normally.
parent ce96221f
...@@ -502,15 +502,16 @@ class DeviceManager { ...@@ -502,15 +502,16 @@ class DeviceManager {
$deviceGabId = $this->device->GetKoeGabBackendFolderId(); $deviceGabId = $this->device->GetKoeGabBackendFolderId();
if (!ZPush::GetBackend()->Setup(KOE_GAB_STORE)) { if (!ZPush::GetBackend()->Setup(KOE_GAB_STORE)) {
ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): setup for store '%s' failed. Unable to search for KOE GAB folder.", KOE_GAB_STORE)); ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): setup for store '%s' failed. Unable to search for KOE GAB folder.", KOE_GAB_STORE));
return false;
} }
$backendGabId = ZPush::GetBackend()->GetKoeGabBackendFolderId(KOE_GAB_NAME); else {
if ($deviceGabId !== $backendGabId) { $backendGabId = ZPush::GetBackend()->GetKoeGabBackendFolderId(KOE_GAB_NAME);
ZLog::Write(LOGLEVEL_DEBUG, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): Backend found different KOE GAB backend folderid: '%s'. Updating ASDevice.", $backendGabId)); if ($deviceGabId !== $backendGabId) {
$this->device->SetKoeGabBackendFolderId($backendGabId); ZLog::Write(LOGLEVEL_DEBUG, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): Backend found different KOE GAB backend folderid: '%s'. Updating ASDevice.", $backendGabId));
$this->device->SetKoeGabBackendFolderId($backendGabId);
}
$folders[$backendGabId] = $this->getAdditionalSyncFolder(KOE_GAB_STORE, $backendGabId, KOE_GAB_NAME, SYNC_FOLDER_TYPE_USER_APPOINTMENT);
} }
$folders[$backendGabId] = $this->getAdditionalSyncFolder(KOE_GAB_STORE, $backendGabId, KOE_GAB_NAME, SYNC_FOLDER_TYPE_USER_APPOINTMENT);
} }
} }
return $folders; return $folders;
......
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