Merge pull request #6 in ZO/z-push from bugfix/ZO-35-z-push-chunkname-should-be-defined to develop

* commit 'fe394c67':
  ZO-35 added support for groups (members + memberOf), room and equipment, fixed bug opening other store than public.

tools/gab-sync/lib/gabentry.php

@@ -11,6 +11,15 @@
 
 
 class GABEntry {
+    const CONTACT = "contact";
+    const GROUP = "group";
+    const ROOM = "room";
+    const EQUIPMENT = "equipment";
+
+    public $type;                           // contact, group, room or equipment
+    public $memberOf;                       // groups the item is a member of
+    public $members;                        // if this is a group, a list of its members
+
     // GABEntry variable                    MAPI Property                               Default LDAP parameter
     public $account;                        // PR_ACCOUNT                               username
     public $displayName;                    // PR_DISPLAY_NAME

tools/gab-sync/lib/zarafa.php

@@ -195,6 +195,9 @@ class Zarafa extends SyncWorker {
      * @return array of GABEntry
      */
     protected function GetGAB($uniqueId = false) {
+        // get all the groups
+        $groups = mapi_zarafa_getgrouplist($this->store);
+
         $data = array();
 
         $addrbook = mapi_openaddressbook($this->session);
@@ -245,10 +248,38 @@ class Zarafa extends SyncWorker {
                                                             PR_BUSINESS_ADDRESS_POST_OFFICE_BOX,
                                                             PR_INITIALS,
                                                             PR_LANGUAGE,
-                                                            PR_EMS_AB_THUMBNAIL_PHOTO
+                                                            PR_EMS_AB_THUMBNAIL_PHOTO,
+                                                            PR_DISPLAY_TYPE_EX
                                                     ));
         foreach ($gabentries as $entry) {
             $a = new GABEntry();
+            $a->type = GABEnty::Contact;
+            $a->memberOf = array();
+            $memberOf = mapi_zarafa_getgrouplistofuser($this->store, $entry[PR_ENTRYID]);
+            if (is_array($memberOf)) {
+                $a->memberOf = array_keys($memberOf);
+            }
+
+            // is this a group?
+            if (array_key_exists($entry[PR_ACCOUNT], $groups)) {
+                $a->type = GABEnty::GROUP;
+                $users = mapi_zarafa_getuserlistofgroup($this->store, $groups[$entry[PR_ACCOUNT]]['groupid']);
+                if (isset($users[$entry[PR_ACCOUNT]]['emailaddress'])) {
+                    $a->smtpAddress = $users[$entry[PR_ACCOUNT]]['emailaddress'];
+                }
+                $a->members = array_keys($users);
+                // remove the group from itself
+                $key = array_search($entry[PR_ACCOUNT], $a->members);
+                if ($key !== false) {
+                    unset($a->members[$key]);
+                }
+            }
+            else if (isset($entry[PR_DISPLAY_TYPE]) && $entry[PR_DISPLAY_TYPE_EX] == DT_ROOM) {
+                $a->type = GABEnty::ROOM;
+            }
+            else if (isset($entry[PR_DISPLAY_TYPE]) && $entry[PR_DISPLAY_TYPE_EX] ==  DT_EQUIPMENT) {
+                $a->type = GABEnty::EQUIPMENT;
+            }
 
             if (isset($entry[PR_ACCOUNT]))                              $a->account                         = $entry[PR_ACCOUNT];
             if (isset($entry[PR_DISPLAY_NAME]))                         $a->displayName                     = $entry[PR_DISPLAY_NAME];
@@ -452,8 +483,8 @@ class Zarafa extends SyncWorker {
             // the default store root
             if ($this->mainUser == HIDDEN_FOLDERSTORE) {
                 $parentprops = mapi_getprops($this->store, array(PR_IPM_SUBTREE_ENTRYID));
-                if (isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]))
-                    $parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
+                if (isset($parentprops[PR_IPM_SUBTREE_ENTRYID]))
+                    $parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
             }
             // get the main public folder
             else {