Merge pull request #368 in ZP/z-push from develop to release/2.3

* commit '6326b756':
  ZP-1045 Only ignore KOE email updates.
  ZP-1044 add separate logrotate file for rhel/rpm. Released under the Affero GNU General Public License (AGPL) version 3.

build/rpm/z-push.spec

@@ -267,8 +267,8 @@ ln -s "%zpush_dir/z-push-top.php" "$b/%_bindir/z-push-top";
 mkdir -p "$b/%_localstatedir/lib/z-push";
 mkdir -p "$b/%_localstatedir/log/z-push";
 mkdir -p "$b/%_sysconfdir/logrotate.d";
-install -Dpm 644 config/z-push.lr \
-    "$b/%_sysconfdir/logrotate.d/"
+install -Dpm 644 config/z-push-rhel.lr \
+    "$b/%_sysconfdir/logrotate.d/z-push.lr"
 
 # CALDAV
 mv "$bdir/caldav/config.php" "$cdir/caldav.conf.php";

config/z-push-rhel.lr

+/var/log/z-push/*.log {
+	size 1k
+	create apache apache
+	compress
+	rotate 4
+}

src/backend/kopano/importer.php

@@ -417,7 +417,7 @@ class ImportChangesICS implements IImportChanges {
             }
 
             // KOE ZP-990: OL updates the deleted category which causes a race condition if more than one KOE is connected to that user
-            if(ZPush::GetDeviceManager()->IsKoe() && KOE_CAPABILITY_RECEIVEFLAGS && !isset($message->flag) && isset($message->categories)) {
+            if(ZPush::GetDeviceManager()->IsKoe() && KOE_CAPABILITY_RECEIVEFLAGS && $message instanceof SyncMail && !isset($message->flag) && isset($message->categories)) {
                 // check if the categories changed
                 $mapiCategories = $this->mapiprovider->GetMessageCategories($props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
                 if( (empty($message->categories) && empty($mapiCategories)) ||