Commit 75550bcf authored by Sebastian Kummer's avatar Sebastian Kummer

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

Merge pull request #179 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

* commit '02a91429':
  ZP-844 Delete from and until properties when out of office is not time based.

(cherry picked from commit 6c326890)
parent 3f6595a1
...@@ -1453,6 +1453,9 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1453,6 +1453,9 @@ class BackendZarafa implements IBackend, ISearchProvider {
$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR; $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
} }
} }
else {
$deleteProps = array(PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL);
}
} }
elseif($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) { elseif($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
$props[PR_EC_OUTOFOFFICE] = false; $props[PR_EC_OUTOFOFFICE] = false;
...@@ -1954,4 +1957,4 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1954,4 +1957,4 @@ class BackendZarafa implements IBackend, ISearchProvider {
*/ */
class BackendICS extends BackendZarafa {} class BackendICS extends BackendZarafa {}
?> ?>
\ No newline at end of file
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