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

Merge pull request #410 in ZP/z-push from bugfix/ZP-1086-encode-globalobjid-in-meeting-requests to develop

* commit '36fd27d9':
  ZP-1086 Encode GlobalObjId in meeting requests depending on calendar item existance.

src/backend/kopano/mapiprovider.php

@@ -571,8 +571,10 @@ class MAPIProvider {
 
             // Get the GOID
             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
-                if (Request::IsGlobalObjIdHexClient()) {
+                if (Request::IsGlobalObjIdHexClient() && !empty($items)) {
                     $message->meetingrequest->globalobjid = strtoupper(bin2hex($props[$meetingrequestproperties["goidtag"]]));
                 }
                 else {
@@ -671,7 +673,9 @@ class MAPIProvider {
                 // check if we are not sending the MR so we can process it - ZP-581
                 $cuser = ZPush::GetBackend()->GetUserDetails(ZPush::GetBackend()->GetCurrentUsername());
                 if(isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) {
+                    if (!isset($req)) {
                         $req = new Meetingrequest($this->store, $mapimessage, $this->session);
+                    }
                     if ($req->isMeetingRequestResponse()) {
                         $req->processMeetingRequestResponse();
                     }