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

Merge pull request #479 in ZP/z-push from bugfix/ZP-1166-gab2contacts-shows-one-empty-contact to develop

* commit '842d464f':
  ZP-1166 Check PR_DISPLAY_TYPE_EX as flag and also ignore DT_ORGANIZATION.

tools/gab2contacts/lib/kopano.php

@@ -202,12 +202,17 @@ class Kopano extends ContactWorker {
                 continue;
             }
             // ignore ROOMS
-            elseif (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] == DT_ROOM) {
+            elseif (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] & DT_ROOM) {
                 $ignored++;
                 continue;
             }
             // ignore EQUIPMENT
-            elseif (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] ==  DT_EQUIPMENT) {
+            elseif (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] & DT_EQUIPMENT) {
+                $ignored++;
+                continue;
+            }
+            // ignore ORGANIZATION
+            elseif (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] & DT_ORGANIZATION) {
                 $ignored++;
                 continue;
             }