Merge pull request #245 in ZP/z-push from bugfix/ZP-934-warnings-while-synchronizing to develop

* commit 'd39f0ce4':
  ZP-934 Use is_resource() to check the stream, check if categories are set before intersecting.

src/backend/kopano/mapiprovider.php

@@ -2459,7 +2459,7 @@ class MAPIProvider {
             $addrbook = $this->getAddressbook();
             $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, array('use_tnef' => -1));
 
-            if (isset($stream)) {
+            if (is_resource($stream)) {
                 $mstreamstat = mapi_stream_stat($stream);
                 $streamsize = $mstreamstat["cb"];
                 if (isset($streamsize)) {

src/lib/syncobjects/syncnote.php

@@ -127,10 +127,12 @@ class SyncNote extends SyncObject {
         // is a color other than yellow set
         if (isset($this->Color) && $this->Color != 3 && $this->Color > -1 && $this->Color < 5) {
             // check existing categories - do not rewrite category if the category is already a supported or unsupported color
-            $insecUnsupp = array_intersect($this->categories, array_values(self::$unsupportedColors));
-            $insecColors = array_intersect($this->categories, array_values(self::$colors));
-            if (!empty($this->categories) && (!empty($insecUnsupp) || !empty($insecColors))) {
-                return false;
+            if (!empty($this->categories)) {
+                $insecUnsupp = array_intersect($this->categories, array_values(self::$unsupportedColors));
+                $insecColors = array_intersect($this->categories, array_values(self::$colors));
+                if (!empty($insecUnsupp) || !empty($insecColors)) {
+                    return false;
+                }
             }
             if(!isset($this->categories)) {
                 $this->categories = array();