Commit 04f189fa authored by skummer's avatar skummer

ZP-114

- fixed: ChangesSink does not return notifications for the source and destination folders in case of moves
- fixed: some typos

git-svn-id: https://z-push.org/svn/z-push/trunk@1319 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent 31ac7f93
...@@ -943,7 +943,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -943,7 +943,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
/** /**
* The folder should be considered by the sink. * The folder should be considered by the sink.
* Folders which were not initialized should not result in a notification * Folders which were not initialized should not result in a notification
* of IBacken->ChangesSink(). * of IBackend->ChangesSink().
* *
* @param string $folderid * @param string $folderid
* *
...@@ -960,7 +960,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -960,7 +960,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
// add entryid to the monitored folders // add entryid to the monitored folders
$this->changesSinkFolders[$entryid] = $folderid; $this->changesSinkFolders[$entryid] = $folderid;
// check if this store is already monitores, else advise it // check if this store is already monitored, else advise it
if (!in_array($this->store, $this->changesSinkStores)) { if (!in_array($this->store, $this->changesSinkStores)) {
mapi_msgstore_advise($this->store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink); mapi_msgstore_advise($this->store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
$this->changesSinkStores[] = $this->store; $this->changesSinkStores[] = $this->store;
...@@ -989,7 +989,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -989,7 +989,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
$notifications[] = $this->changesSinkFolders[$sinknotif['parentid']]; $notifications[] = $this->changesSinkFolders[$sinknotif['parentid']];
} }
// deletes and moves // deletes and moves
else if (isset($sinknotif['oldparentid']) && array_key_exists($sinknotif['oldparentid'], $this->changesSinkFolders)) { if (isset($sinknotif['oldparentid']) && array_key_exists($sinknotif['oldparentid'], $this->changesSinkFolders)) {
$notifications[] = $this->changesSinkFolders[$sinknotif['oldparentid']]; $notifications[] = $this->changesSinkFolders[$sinknotif['oldparentid']];
} }
} }
......
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