Skip to content

Z
z-push
Commit f0112dea authored by Sebastian Kummer's avatar Sebastian Kummer
Browse files
Options

ZO-33 fixed bugs.

parent 9a5f76c8
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
tools/gab-sync/lib/zarafa.php
View file @ f0112dea
...@@ -253,7 +253,7 @@ class Zarafa extends SyncWorker { ...@@ -253,7 +253,7 @@ class Zarafa extends SyncWorker {
)); ));
foreach ($gabentries as $entry) { foreach ($gabentries as $entry) {
$a = new GABEntry(); $a = new GABEntry();
$a->type = GABEnty::Contact; $a->type = GABEntry::CONTACT;
$a->memberOf = array(); $a->memberOf = array();
$memberOf = mapi_zarafa_getgrouplistofuser($this->store, $entry[PR_ENTRYID]); $memberOf = mapi_zarafa_getgrouplistofuser($this->store, $entry[PR_ENTRYID]);
if (is_array($memberOf)) { if (is_array($memberOf)) {
...@@ -262,11 +262,13 @@ class Zarafa extends SyncWorker { ...@@ -262,11 +262,13 @@ class Zarafa extends SyncWorker {
// is this a group? // is this a group?
if (array_key_exists($entry[PR_ACCOUNT], $groups)) { if (array_key_exists($entry[PR_ACCOUNT], $groups)) {
$a->type = GABEnty::GROUP; $a->type = GABEntry::GROUP;
$users = mapi_zarafa_getuserlistofgroup($this->store, $groups[$entry[PR_ACCOUNT]]['groupid']); $users = mapi_zarafa_getuserlistofgroup($this->store, $groups[$entry[PR_ACCOUNT]]['groupid']);
if (isset($users[$entry[PR_ACCOUNT]]['emailaddress'])) { if (isset($users[$entry[PR_ACCOUNT]]['emailaddress'])) {
$a->smtpAddress = $users[$entry[PR_ACCOUNT]]['emailaddress']; $a->smtpAddress = $users[$entry[PR_ACCOUNT]]['emailaddress'];
} }
$a->members = array();
if (is_array($users)) {
$a->members = array_keys($users); $a->members = array_keys($users);
// remove the group from itself // remove the group from itself
$key = array_search($entry[PR_ACCOUNT], $a->members); $key = array_search($entry[PR_ACCOUNT], $a->members);
...@@ -274,11 +276,12 @@ class Zarafa extends SyncWorker { ...@@ -274,11 +276,12 @@ class Zarafa extends SyncWorker {
unset($a->members[$key]); 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) { else if (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] == DT_ROOM) {
$a->type = GABEnty::EQUIPMENT; $a->type = GABEntry::ROOM;
}
else if (isset($entry[PR_DISPLAY_TYPE_EX]) && $entry[PR_DISPLAY_TYPE_EX] == DT_EQUIPMENT) {
$a->type = GABEntry::EQUIPMENT;
} }
if (isset($entry[PR_ACCOUNT])) $a->account = $entry[PR_ACCOUNT]; if (isset($entry[PR_ACCOUNT])) $a->account = $entry[PR_ACCOUNT];
......
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