Skip to content

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

Merge pull request #58 in ZP/z-push from bugfix/ZP-649-fix-resolverecipients-for-zarafa to develop 

* commit '2f63beb7':
  ZP-718 Re-factor resolving recipients in gal and contacts.
  ZP-716 implement ResolveRecipients options processing.
  ZP-649 Fix ResolveRecipients for Zarafa to work with FreeBusy.
parents aeab7567 2f63beb7
Show whitespace changes
Inline Side-by-side
Showing with 252 additions and 130 deletions
src/backend/zarafa/zarafa.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 01.10.2011 * Created : 01.10.2011
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -93,6 +93,8 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -93,6 +93,8 @@ class BackendZarafa implements IBackend, ISearchProvider {
// ZCP config parameter for PR_EC_ENABLED_FEATURES / PR_EC_DISABLED_FEATURES // ZCP config parameter for PR_EC_ENABLED_FEATURES / PR_EC_DISABLED_FEATURES
const ZPUSH_ENABLED = 'mobile'; const ZPUSH_ENABLED = 'mobile';
const MAXAMBIGUOUSRECIPIENTS = 9999;
/** /**
* Constructor of the Zarafa Backend * Constructor of the Zarafa Backend
* *
...@@ -935,24 +937,61 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -935,24 +937,61 @@ class BackendZarafa implements IBackend, ISearchProvider {
public function ResolveRecipients($resolveRecipients) { public function ResolveRecipients($resolveRecipients) {
if ($resolveRecipients instanceof SyncResolveRecipients) { if ($resolveRecipients instanceof SyncResolveRecipients) {
$resolveRecipients->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS; $resolveRecipients->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
$resolveRecipients->recipient = array(); $resolveRecipients->response = array();
$resolveRecipientsOptions = new SyncResolveRecipientsOptions();
$maxAmbiguousRecipients = self::MAXAMBIGUOUSRECIPIENTS;
if (isset($resolveRecipients->options)) {
$resolveRecipientsOptions = $resolveRecipients->options;
// only limit ambiguous recipients if the client requests it.
if (isset($resolveRecipientsOptions->maxambiguousrecipients) &&
$resolveRecipientsOptions->maxambiguousrecipients >= 0 &&
$resolveRecipientsOptions->maxambiguousrecipients <= self::MAXAMBIGUOUSRECIPIENTS) {
$maxAmbiguousRecipients = $resolveRecipientsOptions->maxambiguousrecipients;
ZLog::Write(LOGLEVEL_DEBUG, sprintf("The client requested %d max ambigous recipients to resolve.", $maxAmbiguousRecipients));
}
}
foreach ($resolveRecipients->to as $i => $to) { foreach ($resolveRecipients->to as $i => $to) {
$recipient = $this->resolveRecipient($to); $response = new SyncResolveRecipientsResponse();
if ($recipient instanceof SyncResolveRecipient) { $response->to = $to;
$resolveRecipients->recipient[$i] = $recipient; $response->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
$recipient = $this->resolveRecipient($to, $maxAmbiguousRecipients);
if (is_array($recipient) && !empty($recipient)) {
$response->recipientcount = 0;
foreach ($recipient as $entry) {
if ($entry instanceof SyncResolveRecipient) {
// certificates are already set. Unset them if they weren't required.
if (!isset($resolveRecipientsOptions->certificateretrieval)) {
unset($entry->certificates);
}
if (isset($resolveRecipientsOptions->availability)) {
// TODO implement availability retrieval of the recipient
}
if (isset($resolveRecipientsOptions->picture)) {
// TODO implement picture retrieval of the recipient
}
$response->recipientcount++;
$response->recipient[] = $entry;
} }
elseif (is_int($recipient)) { elseif (is_int($recipient)) {
$resolveRecipients->status = $recipient; $response->status = $recipient;
} }
} }
}
$resolveRecipients->response[$i] = $response;
}
return $resolveRecipients; return $resolveRecipients;
} }
ZLog::Write(LOGLEVEL_WARN, "Not a valid SyncResolveRecipients object."); ZLog::Write(LOGLEVEL_WARN, "Not a valid SyncResolveRecipients object.");
// return a SyncResolveRecipients object so that sync doesn't fail // return a SyncResolveRecipients object so that sync doesn't fail
$r = new SyncResolveRecipients(); $r = new SyncResolveRecipients();
$r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR; $r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR;
$r->recipient = array();
return $r; return $r;
} }
...@@ -989,6 +1028,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -989,6 +1028,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
// only return users whose displayName or the username starts with $name // only return users whose displayName or the username starts with $name
//TODO: use PR_ANR for this restriction instead of PR_DISPLAY_NAME and PR_ACCOUNT //TODO: use PR_ANR for this restriction instead of PR_DISPLAY_NAME and PR_ACCOUNT
$addrbook = $this->getAddressbook(); $addrbook = $this->getAddressbook();
// FIXME: create a function to get the adressbook contentstable
if ($addrbook) if ($addrbook)
$ab_entryid = mapi_ab_getdefaultdir($addrbook); $ab_entryid = mapi_ab_getdefaultdir($addrbook);
if ($ab_entryid) if ($ab_entryid)
...@@ -1644,17 +1684,18 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1644,17 +1684,18 @@ class BackendZarafa implements IBackend, ISearchProvider {
* Resolve recipient based on his email address. * Resolve recipient based on his email address.
* *
* @param string $to * @param string $to
* @param int $maxAmbiguousRecipients
* *
* @return SyncResolveRecipient|boolean * @return SyncResolveRecipient|boolean
*/ */
private function resolveRecipient($to) { private function resolveRecipient($to, $maxAmbiguousRecipients) {
$recipient = $this->resolveRecipientGAL($to); $recipient = $this->resolveRecipientGAL($to, $maxAmbiguousRecipients);
if ($recipient !== false) { if ($recipient !== false) {
return $recipient; return $recipient;
} }
$recipient = $this->resolveRecipientContact($to); $recipient = $this->resolveRecipientContact($to, $maxAmbiguousRecipients);
if ($recipient !== false) { if ($recipient !== false) {
return $recipient; return $recipient;
...@@ -1667,19 +1708,19 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1667,19 +1708,19 @@ class BackendZarafa implements IBackend, ISearchProvider {
* Resolves recipient from the GAL and gets his certificates. * Resolves recipient from the GAL and gets his certificates.
* *
* @param string $to * @param string $to
* @return SyncResolveRecipient|boolean * @param int $maxAmbiguousRecipients
* @return array|boolean
*/ */
private function resolveRecipientGAL($to) { private function resolveRecipientGAL($to, $maxAmbiguousRecipients) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("Resolving recipient '%s' in GAL", $to));
$addrbook = $this->getAddressbook(); $addrbook = $this->getAddressbook();
// FIXME: create a function to get the adressbook contentstable
$ab_entryid = mapi_ab_getdefaultdir($addrbook); $ab_entryid = mapi_ab_getdefaultdir($addrbook);
if ($ab_entryid) if ($ab_entryid)
$ab_dir = mapi_ab_openentry($addrbook, $ab_entryid); $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
if ($ab_dir) if ($ab_dir)
$table = mapi_folder_getcontentstable($ab_dir); $table = mapi_folder_getcontentstable($ab_dir);
// if (!$table)
// throw new StatusException(sprintf("ZarafaBackend->resolveRecipient(): could not open addressbook: 0x%X", mapi_last_hresult()), SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP);
if (!$table) { if (!$table) {
ZLog::Write(LOGLEVEL_WARN, sprintf("Unable to open addressbook:0x%X", mapi_last_hresult())); ZLog::Write(LOGLEVEL_WARN, sprintf("Unable to open addressbook:0x%X", mapi_last_hresult()));
return false; return false;
...@@ -1690,21 +1731,31 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1690,21 +1731,31 @@ class BackendZarafa implements IBackend, ISearchProvider {
$querycnt = mapi_table_getrowcount($table); $querycnt = mapi_table_getrowcount($table);
if ($querycnt > 0) { if ($querycnt > 0) {
$abentries = mapi_table_queryrows($table, array(PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT), 0, 1); $recipientGal = array();
$certificates = // get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
// check if there are any certificates available $abentries = mapi_table_queryrows($table, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT, PR_OBJECT_TYPE), 0, $maxAmbiguousRecipients);
(isset($abentries[0][PR_EMS_AB_TAGGED_X509_CERT]) && is_array($abentries[0][PR_EMS_AB_TAGGED_X509_CERT]) && count($abentries[0][PR_EMS_AB_TAGGED_X509_CERT])) ? for ($i = 0, $nrEntries = count($abentries); $i < $nrEntries; $i++) {
$this->getCertificates($abentries[0][PR_EMS_AB_TAGGED_X509_CERT], $querycnt) : false; if ($abentries[$i][PR_OBJECT_TYPE] == MAPI_DISTLIST) {
if ($certificates === false) { // dist lists must be expanded into their members
// the recipient does not have a valid certificate, set the appropriate status ZLog::Write(LOGLEVEL_DEBUG, sprintf("'%s' is a dist list. Expand it to members.", $to));
ZLog::Write(LOGLEVEL_INFO, sprintf("No certificates found for '%s'", $to)); $distList = mapi_ab_openentry($addrbook, $abentries[$i][PR_ENTRYID]);
$certificates = $this->getCertificates(false); $distListContent = mapi_folder_getcontentstable($distList);
$distListMembers = mapi_table_queryallrows($distListContent, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT));
for ($j = 0, $nrDistListMembers = mapi_table_getrowcount($distListContent); $j < $nrDistListMembers; $j++) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("distlist's '%s' member", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
}
}
elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $abentries[$i]);
} }
$recipient = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, w2u($abentries[0][PR_DISPLAY_NAME]), $to, $certificates); }
return $recipient;
ZLog::Write(LOGLEVEL_WBXML, "Found a recipient in GAL");
return $recipientGal;
} }
else { else {
ZLog::Write(LOGLEVEL_WARN, sprintf("No recipient found for: '%s'", $to)); ZLog::Write(LOGLEVEL_WARN, sprintf("No recipient found for: '%s' in GAL", $to));
return SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP; return SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP;
} }
return false; return false;
...@@ -1714,10 +1765,12 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1714,10 +1765,12 @@ class BackendZarafa implements IBackend, ISearchProvider {
* Resolves recipient from the contact list and gets his certificates. * Resolves recipient from the contact list and gets his certificates.
* *
* @param string $to * @param string $to
* @param int $maxAmbiguousRecipients
* *
* @return SyncResolveRecipient|boolean * @return array|boolean
*/ */
private function resolveRecipientContact($to) { private function resolveRecipientContact($to, $maxAmbiguousRecipients) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("Resolving recipient '%s' in user's contacts", $to));
// go through all contact folders of the user and // go through all contact folders of the user and
// check if there's a contact with the given email address // check if there's a contact with the given email address
$root = mapi_msgstore_openentry($this->defaultstore); $root = mapi_msgstore_openentry($this->defaultstore);
...@@ -1729,32 +1782,22 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1729,32 +1782,22 @@ class BackendZarafa implements IBackend, ISearchProvider {
$recipients = array(); $recipients = array();
if ($contacts !== false) { if ($contacts !== false) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("Found %d contacts in main contacts folder.", count($contacts)));
// create resolve recipient object // create resolve recipient object
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$certificates = $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
// check if there are any certificates available
(isset($contact[PR_USER_X509_CERTIFICATE]) && is_array($contact[PR_USER_X509_CERTIFICATE]) && count($contact[PR_USER_X509_CERTIFICATE])) ?
$this->getCertificates($contact[PR_USER_X509_CERTIFICATE], 1) : false;
if ($certificates !== false) {
return $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, u2w($contact[PR_DISPLAY_NAME]), $to, $certificates);
}
} }
} }
$contactfolder = mapi_msgstore_openentry($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID]); $contactfolder = mapi_msgstore_openentry($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID]);
$subfolders = MAPIUtils::GetSubfoldersForType($contactfolder, "IPF.Contact"); $subfolders = MAPIUtils::GetSubfoldersForType($contactfolder, "IPF.Contact");
if ($subfolders !== false) {
foreach($subfolders as $folder) { foreach($subfolders as $folder) {
$contacts = $this->getContactsFromFolder($this->defaultstore, $folder[PR_ENTRYID], $to); $contacts = $this->getContactsFromFolder($this->defaultstore, $folder[PR_ENTRYID], $to);
if ($contacts !== false) { if ($contacts !== false) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("Found %d contacts in contacts' subfolder.", count($contacts)));
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$certificates = $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
// check if there are any certificates available
(isset($contact[PR_USER_X509_CERTIFICATE]) && is_array($contact[PR_USER_X509_CERTIFICATE]) && count($contact[PR_USER_X509_CERTIFICATE])) ?
$this->getCertificates($contact[PR_USER_X509_CERTIFICATE], 1) : false;
if ($certificates !== false) {
return $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, u2w($contact[PR_DISPLAY_NAME]), $to, $certificates);
} }
} }
} }
...@@ -1777,15 +1820,9 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1777,15 +1820,9 @@ class BackendZarafa implements IBackend, ISearchProvider {
foreach($subfolders as $folder) { foreach($subfolders as $folder) {
$contacts = $this->getContactsFromFolder($publicstore, $folder[PR_ENTRYID], $to); $contacts = $this->getContactsFromFolder($publicstore, $folder[PR_ENTRYID], $to);
if ($contacts !== false) { if ($contacts !== false) {
ZLog::Write(LOGLEVEL_WBXML, sprintf("Found %d contacts in public contacts folder.", count($contacts)));
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$certificates = $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
// check if there are any certificates available
(isset($contact[PR_USER_X509_CERTIFICATE]) && is_array($contact[PR_USER_X509_CERTIFICATE]) && count($contact[PR_USER_X509_CERTIFICATE])) ?
$this->getCertificates($contact[PR_USER_X509_CERTIFICATE], 1) : false;
if ($certificates !== false) {
return $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, u2w($contact[PR_DISPLAY_NAME]), $to, $certificates);
}
} }
} }
} }
...@@ -1798,20 +1835,26 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1798,20 +1835,26 @@ class BackendZarafa implements IBackend, ISearchProvider {
ZLog::Write(LOGLEVEL_WARN, sprintf("Unable to open public store: 0x%X", $result)); ZLog::Write(LOGLEVEL_WARN, sprintf("Unable to open public store: 0x%X", $result));
} }
$certificates = $this->getCertificates(false); if (empty($recipients)) {
return $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $to, $certificates); $contactProperties = array();
$contactProperties[PR_DISPLAY_NAME] = $to;
$contactProperties[PR_USER_X509_CERTIFICATE] = false;
$recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contactProperties);
}
return $recipients;
} }
/** /**
* Creates SyncRRCertificates object for ResolveRecipients * Creates SyncResolveRecipientsCertificates object for ResolveRecipients
* *
* @param binary $certificates * @param binary $certificates
* @param int $recipientCount * @param int $recipientCount
* *
* @return SyncRRCertificates * @return SyncResolveRecipientsCertificates
*/ */
private function getCertificates($certificates, $recipientCount = 0) { private function getCertificates($certificates, $recipientCount = 0) {
$cert = new SyncRRCertificates(); $cert = new SyncResolveRecipientsCertificates();
if ($certificates === false) { if ($certificates === false) {
$cert->status = SYNC_RESOLVERECIPSSTATUS_CERTIFICATES_NOVALIDCERT; $cert->status = SYNC_RESOLVERECIPSSTATUS_CERTIFICATES_NOVALIDCERT;
return $cert; return $cert;
...@@ -1827,27 +1870,38 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1827,27 +1870,38 @@ class BackendZarafa implements IBackend, ISearchProvider {
} }
/** /**
* * Creates SyncResolveRecipient object for ResolveRecipientsResponse.
* @param int $type * @param int $type
* @param string $displayname
* @param string $email * @param string $email
* @param array $certificates * @param array $recipientProperties
* @param int $recipientCount
* *
* @return SyncResolveRecipient * @return SyncResolveRecipient
*/ */
private function createResolveRecipient($type, $displayname, $email, $certificates) { private function createResolveRecipient($type, $email, $recipientProperties, $recipientCount = 0) {
$recipient = new SyncResolveRecipient(); $recipient = new SyncResolveRecipient();
$recipient->type = $type; $recipient->type = $type;
$recipient->displayname = $displayname; $recipient->displayname = u2w($recipientProperties[PR_DISPLAY_NAME]);
$recipient->emailaddress = $email; $recipient->emailaddress = $email;
$recipient->certificates = $certificates;
if ($recipient->certificates === false) { if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
// the recipient does not have a valid certificate, set the appropriate status $certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
ZLog::Write(LOGLEVEL_INFO, sprintf("No certificates found for '%s'", $email)); }
$cert = new SyncRRCertificates(); elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
$cert->status = SYNC_RESOLVERECIPSSTATUS_CERTIFICATES_NOVALIDCERT; $certificateProp = PR_USER_X509_CERTIFICATE;
$recipient->certificates = $cert; }
else {
$certificateProp = null;
} }
if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
$certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
}
else {
$certificates = $this->getCertificates(false);
ZLog::Write(LOGLEVEL_INFO, sprintf("No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
}
$recipient->certificates = $certificates;
return $recipient; return $recipient;
} }
...@@ -1866,7 +1920,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1866,7 +1920,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
mapi_table_restrict($folderContent, MAPIUtils::GetEmailAddressRestriction($store, $email)); mapi_table_restrict($folderContent, MAPIUtils::GetEmailAddressRestriction($store, $email));
// TODO max limit // TODO max limit
if (mapi_table_getrowcount($folderContent) > 0) { if (mapi_table_getrowcount($folderContent) > 0) {
return mapi_table_queryallrows($folderContent, array(PR_DISPLAY_NAME, PR_USER_X509_CERTIFICATE)); return mapi_table_queryallrows($folderContent, array(PR_DISPLAY_NAME, PR_USER_X509_CERTIFICATE, PR_ENTRYID));
} }
return false; return false;
} }
......
src/index.php
View file @ 80f1d572
...@@ -117,6 +117,7 @@ include_once('lib/syncobjects/syncsendmailsource.php'); ...@@ -117,6 +117,7 @@ include_once('lib/syncobjects/syncsendmailsource.php');
include_once('lib/syncobjects/syncvalidatecert.php'); include_once('lib/syncobjects/syncvalidatecert.php');
include_once('lib/syncobjects/syncresolverecipients.php'); include_once('lib/syncobjects/syncresolverecipients.php');
include_once('lib/syncobjects/syncresolverecipient.php'); include_once('lib/syncobjects/syncresolverecipient.php');
include_once('lib/syncobjects/syncresolverecipientsresponse.php');
include_once('lib/syncobjects/syncresolverecipientsoptions.php'); include_once('lib/syncobjects/syncresolverecipientsoptions.php');
include_once('lib/syncobjects/syncresolverecipientsavailability.php'); include_once('lib/syncobjects/syncresolverecipientsavailability.php');
include_once('lib/syncobjects/syncresolverecipientscertificates.php'); include_once('lib/syncobjects/syncresolverecipientscertificates.php');
......
src/lib/default/backend.php
View file @ 80f1d572
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* *
* Created : 01.10.2007 * Created : 01.10.2007
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -199,7 +199,6 @@ abstract class Backend implements IBackend { ...@@ -199,7 +199,6 @@ abstract class Backend implements IBackend {
public function ResolveRecipients($resolveRecipients) { public function ResolveRecipients($resolveRecipients) {
$r = new SyncResolveRecipients(); $r = new SyncResolveRecipients();
$r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR; $r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR;
$r->recipient = array();
return $r; return $r;
} }
......
src/lib/request/resolverecipients.php
View file @ 80f1d572
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Created : 15.10.2012 * Created : 15.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -64,7 +64,6 @@ class ResolveRecipients extends RequestProcessor { ...@@ -64,7 +64,6 @@ class ResolveRecipients extends RequestProcessor {
$resolveRecipients = self::$backend->ResolveRecipients($resolveRecipients); $resolveRecipients = self::$backend->ResolveRecipients($resolveRecipients);
self::$encoder->startWBXML(); self::$encoder->startWBXML();
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS);
...@@ -72,30 +71,32 @@ class ResolveRecipients extends RequestProcessor { ...@@ -72,30 +71,32 @@ class ResolveRecipients extends RequestProcessor {
self::$encoder->content($resolveRecipients->status); self::$encoder->content($resolveRecipients->status);
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_STATUS self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_STATUS
if ($resolveRecipients->status == SYNC_COMMONSTATUS_SUCCESS && !empty($resolveRecipients->response)) {
foreach ($resolveRecipients->to as $i => $to) { foreach ($resolveRecipients->response as $i => $response) {
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RESPONSE); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RESPONSE);
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_TO); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_TO);
self::$encoder->content($to); self::$encoder->content($response->to);
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_TO self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_TO
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_STATUS); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_STATUS);
self::$encoder->content($resolveRecipients->status); self::$encoder->content($response->status);
self::$encoder->endTag(); self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_STATUS
// do only if recipient is resolved // do only if recipient is resolved
if ($resolveRecipients->status != SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP) { if ($response->status != SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP && !empty($response->recipient)) {
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT);
self::$encoder->content(count($resolveRecipients->recipient)); self::$encoder->content(count($response->recipient));
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT
foreach ($response->recipient as $recipient) {
self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RECIPIENT); self::$encoder->startTag(SYNC_RESOLVERECIPIENTS_RECIPIENT);
$resolveRecipients->recipient[$i]->Encode(self::$encoder); $recipient->Encode(self::$encoder);
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RECIPIENT self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RECIPIENT
} }
}
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RESPONSE self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RESPONSE
} }
}
self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS self::$encoder->endTag(); // SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS
return true; return true;
......
src/lib/syncobjects/syncresolverecipient.php 100755 → 100644
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.10.2012 * Created : 28.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -51,7 +51,7 @@ class SyncResolveRecipient extends SyncObject { ...@@ -51,7 +51,7 @@ class SyncResolveRecipient extends SyncObject {
public $emailaddress; public $emailaddress;
public $availability; public $availability;
public $certificates; public $certificates;
public $pictures; public $picture;
public function SyncResolveRecipient() { public function SyncResolveRecipient() {
$mapping = array ( $mapping = array (
...@@ -60,14 +60,13 @@ class SyncResolveRecipient extends SyncObject { ...@@ -60,14 +60,13 @@ class SyncResolveRecipient extends SyncObject {
SYNC_RESOLVERECIPIENTS_EMAILADDRESS => array ( self::STREAMER_VAR => "emailaddress"), SYNC_RESOLVERECIPIENTS_EMAILADDRESS => array ( self::STREAMER_VAR => "emailaddress"),
SYNC_RESOLVERECIPIENTS_AVAILABILITY => array ( self::STREAMER_VAR => "availability", SYNC_RESOLVERECIPIENTS_AVAILABILITY => array ( self::STREAMER_VAR => "availability",
self::STREAMER_TYPE => "SyncRRAvailability"), self::STREAMER_TYPE => "SyncResolveRecipientsAvailability"),
SYNC_RESOLVERECIPIENTS_CERTIFICATES => array ( self::STREAMER_VAR => "certificates", SYNC_RESOLVERECIPIENTS_CERTIFICATES => array ( self::STREAMER_VAR => "certificates",
self::STREAMER_TYPE => "SyncRRCertificates"), self::STREAMER_TYPE => "SyncResolveRecipientsCertificates"),
SYNC_RESOLVERECIPIENTS_PICTURE => array ( self::STREAMER_VAR => "pictures", SYNC_RESOLVERECIPIENTS_PICTURE => array ( self::STREAMER_VAR => "picture",
self::STREAMER_TYPE => "SyncRRPicture", self::STREAMER_TYPE => "SyncResolveRecipientsPicture"),
self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_PICTURE),
); );
parent::SyncObject($mapping); parent::SyncObject($mapping);
......
src/lib/syncobjects/syncresolverecipients.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.10.2012 * Created : 28.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -49,8 +49,7 @@ class SyncResolveRecipients extends SyncObject { ...@@ -49,8 +49,7 @@ class SyncResolveRecipients extends SyncObject {
public $to = array(); public $to = array();
public $options; public $options;
public $status; public $status;
public $recipientCount; public $response;
public $recipient;
public function SyncResolveRecipients() { public function SyncResolveRecipients() {
$mapping = array ( $mapping = array (
...@@ -59,13 +58,13 @@ class SyncResolveRecipients extends SyncObject { ...@@ -59,13 +58,13 @@ class SyncResolveRecipients extends SyncObject {
self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER), self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER),
SYNC_RESOLVERECIPIENTS_OPTIONS => array ( self::STREAMER_VAR => "options", SYNC_RESOLVERECIPIENTS_OPTIONS => array ( self::STREAMER_VAR => "options",
self::STREAMER_TYPE => "SyncRROptions"), self::STREAMER_TYPE => "SyncResolveRecipientsOptions"),
SYNC_RESOLVERECIPIENTS_STATUS => array ( self::STREAMER_VAR => "status"), SYNC_RESOLVERECIPIENTS_STATUS => array ( self::STREAMER_VAR => "status"),
SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => array ( self::STREAMER_VAR => "recipientcount"),
SYNC_RESOLVERECIPIENTS_RECIPIENT => array ( self::STREAMER_VAR => "recipient", SYNC_RESOLVERECIPIENTS_RESPONSE => array ( self::STREAMER_VAR => "response",
self::STREAMER_TYPE => "SyncResolveRecipient"), self::STREAMER_TYPE => "SyncResolveRecipientsResponse",
self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RESPONSE),
); );
parent::SyncObject($mapping); parent::SyncObject($mapping);
......
src/lib/syncobjects/syncresolverecipientsavailability.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.12.2012 * Created : 28.12.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
class SyncRRAvailability extends SyncObject { class SyncResolveRecipientsAvailability extends SyncObject {
public $starttime; public $starttime;
public $endtime; public $endtime;
public $status; public $status;
public $mergedfreebusy; public $mergedfreebusy;
public function SyncRRAvailability() { public function SyncResolveRecipientsAvailability() {
$mapping = array ( $mapping = array (
SYNC_RESOLVERECIPIENTS_STARTTIME => array ( self::STREAMER_VAR => "starttime"), SYNC_RESOLVERECIPIENTS_STARTTIME => array ( self::STREAMER_VAR => "starttime"),
SYNC_RESOLVERECIPIENTS_ENDTIME => array ( self::STREAMER_VAR => "endtime"), SYNC_RESOLVERECIPIENTS_ENDTIME => array ( self::STREAMER_VAR => "endtime"),
......
src/lib/syncobjects/syncresolverecipientscertificates.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.10.2012 * Created : 28.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
class SyncRRCertificates extends SyncObject { class SyncResolveRecipientsCertificates extends SyncObject {
public $status; public $status;
public $certificatecount; public $certificatecount;
public $recipientcount; public $recipientcount;
public $certificate; public $certificate;
public $minicertificate; public $minicertificate;
public function SyncRRCertificates() { public function SyncResolveRecipientsCertificates() {
$mapping = array ( $mapping = array (
SYNC_RESOLVERECIPIENTS_STATUS => array ( self::STREAMER_VAR => "status"), SYNC_RESOLVERECIPIENTS_STATUS => array ( self::STREAMER_VAR => "status"),
SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT => array ( self::STREAMER_VAR => "certificatecount"), SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT => array ( self::STREAMER_VAR => "certificatecount"),
......
src/lib/syncobjects/syncresolverecipientsoptions.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.10.2012 * Created : 28.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -45,24 +45,24 @@ ...@@ -45,24 +45,24 @@
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
class SyncRROptions extends SyncObject { class SyncResolveRecipientsOptions extends SyncObject {
public $certificateretrieval; public $certificateretrieval;
public $maxcertificates; public $maxcertificates;
public $maxambiguousrecipients; public $maxambiguousrecipients;
public $availability; public $availability;
public $picture; public $picture;
public function SyncRROptions() { public function SyncResolveRecipientsOptions() {
$mapping = array ( $mapping = array (
SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL => array ( self::STREAMER_VAR => "certificateretrieval"), SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL => array ( self::STREAMER_VAR => "certificateretrieval"),
SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES => array ( self::STREAMER_VAR => "maxcertificates"), SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES => array ( self::STREAMER_VAR => "maxcertificates"),
SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS => array ( self::STREAMER_VAR => "maxambiguousrecipients"), SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS => array ( self::STREAMER_VAR => "maxambiguousrecipients"),
SYNC_RESOLVERECIPIENTS_AVAILABILITY => array ( self::STREAMER_VAR => "availability", SYNC_RESOLVERECIPIENTS_AVAILABILITY => array ( self::STREAMER_VAR => "availability",
self::STREAMER_TYPE => "SyncRRAvailability"), self::STREAMER_TYPE => "SyncResolveRecipientsAvailability"),
SYNC_RESOLVERECIPIENTS_PICTURE => array ( self::STREAMER_VAR => "picture", SYNC_RESOLVERECIPIENTS_PICTURE => array ( self::STREAMER_VAR => "picture",
self::STREAMER_TYPE => "SyncRRPicture"), self::STREAMER_TYPE => "SyncResolveRecipientsPicture"),
); );
parent::SyncObject($mapping); parent::SyncObject($mapping);
......
src/lib/syncobjects/syncresolverecipientspicture.php
View file @ 80f1d572
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* Created : 28.10.2012 * Created : 28.10.2012
* *
* Copyright 2007 - 2013 Zarafa Deutschland GmbH * Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3, * it under the terms of the GNU Affero General Public License, version 3,
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
class SyncRRPicture extends SyncObject { class SyncResolveRecipientsPicture extends SyncObject {
public $maxsize; public $maxsize;
public $maxpictures; public $maxpictures;
public $status; public $status;
public $data; public $data;
public function SyncRRPicture() { public function SyncResolveRecipientsPicture() {
$mapping = array ( $mapping = array (
SYNC_RESOLVERECIPIENTS_MAXSIZE => array ( self::STREAMER_VAR => "maxsize"), SYNC_RESOLVERECIPIENTS_MAXSIZE => array ( self::STREAMER_VAR => "maxsize"),
SYNC_RESOLVERECIPIENTS_MAXPICTURES => array ( self::STREAMER_VAR => "maxpictures"), SYNC_RESOLVERECIPIENTS_MAXPICTURES => array ( self::STREAMER_VAR => "maxpictures"),
......
src/lib/syncobjects/syncresolverecipientsresponse.php 0 → 100644
View file @ 80f1d572
<?php
/**********************************************************
* File : syncresolverecipientsresponse.php
* Project : Z-Push
* Descr : WBXML appointment entities that can be
* parsed directly (as a stream) from WBXML.
* It is automatically decoded
* according to $mapping,
* and the Sync WBXML mappings
*
* Created : 07.09.2015
*
* Copyright 2015 Zarafa Deutschland GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation with the following additional
* term according to sec. 7:
*
* According to sec. 7 of the GNU Affero General Public License, version 3,
* the terms of the AGPL are supplemented with the following terms:
*
* "Zarafa" is a registered trademark of Zarafa B.V.
* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
* The licensing of the Program under the AGPL does not imply a trademark license.
* Therefore any rights, title and interest in our trademarks remain entirely with us.
*
* However, if you propagate an unmodified version of the Program you are
* allowed to use the term "Z-Push" to indicate that you distribute the Program.
* Furthermore you may use our trademarks where it is necessary to indicate
* the intended purpose of a product or service provided you use it in accordance
* with honest practices in industrial or commercial matters.
* If you want to propagate modified versions of the Program under the name "Z-Push",
* you may only do so if you have a written permission by Zarafa Deutschland GmbH
* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Consult LICENSE file for details
************************************************/
class SyncResolveRecipientsResponse extends SyncObject {
public $to;
public $status;
public $recipientcount;
public $recipient;
public function SyncResolveRecipientsResponse() {
$mapping = array (
SYNC_RESOLVERECIPIENTS_TO => array ( self::STREAMER_VAR => "to"),
SYNC_RESOLVERECIPIENTS_STATUS => array ( self::STREAMER_VAR => "status"),
SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT => array ( self::STREAMER_VAR => "recipientcount"),
SYNC_RESOLVERECIPIENTS_RECIPIENT => array ( self::STREAMER_VAR => "recipient",
self::STREAMER_TYPE => "SyncResolveRecipient",
self::STREAMER_ARRAY => SYNC_RESOLVERECIPIENTS_RECIPIENT),
);
parent::SyncObject($mapping);
}
}
\ No newline at end of file
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