• Sebastian Kummer's avatar
    Merging in latest from upstream (ZP/z-push:refs/heads/develop) · 130ada9b
    Sebastian Kummer authored
    * commit '06dbc529':
      ZP-872 BackendZarafa->adviseStoreToSink() sometimes advised wrong store.
      ZP-871 Delete the pingable flag only if it is set, SyncCollections iterator: exclude 'false' as valid collection key (hierarchy state), explicitely implement SyncParameters->GetBackendFolderId() as it will return false in case of an upgraded profile.
      ZP-843 Fixed warnings if there is no stream (property empty).
      ZP-849 SYNC_STATUS_FOLDERHIERARCHYCHANGED is always global and should be transmitted like a common status code (fix for BB), AdditionalFolders API and statically shared folders work always with backendids (they are internally mapped and transmitted with integerIds), expose integerIds in the listing of the AdditionalFolders API as "syncfolderid", generate integerid when an additional folder is added, have ZPush::$addSyncFolders and DeviceManager()->GetAdditionalUserSyncFolders() always work on backendIds, ZPush::GetAdditionalSyncFolders() can return integerIds as keys if requested (default as backendIds), do Backend->Setup() with backendIds in ChangesMemoryWrapper, backendfolderid needs to be set in SyncParameters unsetdata, allow Notes folders as additional static folders.
      ZP-849 Changes: - Move folders correctly with mapped and traditional profiles - Changed IIChanges->ImportFolderChange() to return a SyncFolder object to transport all ids. - Added logging to Zarafa importer and folder move operations.
      ZP-849 Fixed typos, removed unnecessary isset() checks.
      ZP-849 Several changes here: - Changed IImportChanges interface to use an SyncFolder object on ImportFolderDeletion, changed all implementing classes to work with the new parameter to allow clean rewriting of ids for backends. - Expose folderid <-> backend-folderid conversion in both directions via DeviceManager, saved in the ASDevice contentdata. - All folderids passed to the backend, are rewritten to the backend-folderids, where all processing operations are done (as is) on the new/short AS folderids. - Never save ASDevice data when doing Ping, as on hierarchy changes there will be race conditions between, e.g. FolderCreate and the running Ping request, where Ping potentially wins writing this information (risk of inconsistent AS folderids). The ASDevice is only changed because during hierarchy verification new folders get a new AS folderid. This is not used anywhere and really done on the following FolderSync operation.
      ZP-691 Remove legacy stuff - rename custom error handler to zpush_error_handler.
      ZP-691 Remove legacy stuff - removed debugLog().
    130ada9b
zpushdefs.php 55.8 KB