Commit 36fd27d9 authored by Manfred Kutas's avatar Manfred Kutas

ZP-1086 Encode GlobalObjId in meeting requests depending on calendar

item existance.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 9d3c7109
...@@ -589,8 +589,10 @@ class MAPIProvider { ...@@ -589,8 +589,10 @@ class MAPIProvider {
// Get the GOID // Get the GOID
if(isset($props[$meetingrequestproperties["goidtag"]])) { if(isset($props[$meetingrequestproperties["goidtag"]])) {
$req = new Meetingrequest($this->store, $mapimessage, $this->session);
$items = $req->findCalendarItems($props[$meetingrequestproperties["goidtag"]]);
// GlobalObjId support was removed in AS 16.0 // GlobalObjId support was removed in AS 16.0
if (Request::IsGlobalObjIdHexClient()) { if (Request::IsGlobalObjIdHexClient() && !empty($items)) {
$message->meetingrequest->globalobjid = strtoupper(bin2hex($props[$meetingrequestproperties["goidtag"]])); $message->meetingrequest->globalobjid = strtoupper(bin2hex($props[$meetingrequestproperties["goidtag"]]));
} }
else { else {
...@@ -689,7 +691,9 @@ class MAPIProvider { ...@@ -689,7 +691,9 @@ class MAPIProvider {
// check if we are not sending the MR so we can process it - ZP-581 // check if we are not sending the MR so we can process it - ZP-581
$cuser = ZPush::GetBackend()->GetUserDetails(ZPush::GetBackend()->GetCurrentUsername()); $cuser = ZPush::GetBackend()->GetUserDetails(ZPush::GetBackend()->GetCurrentUsername());
if(isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) { if(isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) {
$req = new Meetingrequest($this->store, $mapimessage, $this->session); if (!isset($req)) {
$req = new Meetingrequest($this->store, $mapimessage, $this->session);
}
if ($req->isMeetingRequestResponse()) { if ($req->isMeetingRequestResponse()) {
$req->processMeetingRequestResponse(); $req->processMeetingRequestResponse();
} }
......
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