ZP-581 #comment before processing a meeting request confirmation or...

ZP-581 #comment before processing a meeting request confirmation or cancellation, check if the current user is not the sender and only process it then. Should fix the auto-cancellation when cancelling one attendee.

git-svn-id: https://z-push.org/svn/z-push/trunk@1936 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/zarafa/mapiprovider.php

@@ -648,12 +648,16 @@ class MAPIProvider {
             // if a meeting request response hasn't been processed yet,
             // do it so that the attendee status is updated on the mobile
             if(!isset($messageprops[$emailproperties["processed"]])) {
-                $req = new Meetingrequest($this->store, $mapimessage, $this->session);
-                if ($req->isMeetingRequestResponse()) {
-                    $req->processMeetingRequestResponse();
-                }
-                if ($req->isMeetingCancellation()) {
-                    $req->processMeetingCancellation();
+                // 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) {
+                    $req = new Meetingrequest($this->store, $mapimessage, $this->session);
+                    if ($req->isMeetingRequestResponse()) {
+                        $req->processMeetingRequestResponse();
+                    }
+                    if ($req->isMeetingCancellation()) {
+                        $req->processMeetingCancellation();
+                    }
                 }
             }
             $message->contentclass = DEFAULT_CALENDAR_CONTENTCLASS;

src/backend/zarafa/zarafa.php

@@ -1195,12 +1195,21 @@ class BackendZarafa implements IBackend, ISearchProvider {
      */
     public function GetUserDetails($username) {
         ZLog::Write(LOGLEVEL_WBXML, sprintf("ZarafaBackend->GetUserDetails for '%s'.", $username));
-        $zarafauserinfo = @mapi_zarafa_getuser_by_name($this->defaultstore, $username);
+        $zarafauserinfo = @mapi_zarafa_getuser_by_name($this->store, $username);
         $userDetails['emailaddress'] = (isset($zarafauserinfo['emailaddress']) && $zarafauserinfo['emailaddress']) ? $zarafauserinfo['emailaddress'] : false;
         $userDetails['fullname'] = (isset($zarafauserinfo['fullname']) && $zarafauserinfo['fullname']) ? $zarafauserinfo['fullname'] : false;
         return $userDetails;
     }
 
+    /**
+     * Returns the username of the currently active user
+     *
+     * @access public
+     * @return String
+     */
+    public function GetCurrentUsername() {
+        return $this->storeName;
+    }
 
     /**----------------------------------------------------------------------------------------------------------
      * Private methods

src/lib/default/backend.php

@@ -215,6 +215,16 @@ abstract class Backend implements IBackend {
         return array('emailaddress' => $username, 'fullname' => $username);
     }
 
+    /**
+     * Returns the username and store of the currently active user
+     *
+     * @access public
+     * @return Array
+     */
+    public function GetCurrentUsername() {
+        return $this->GetUserDetails(Request::GetAuthUser());
+    }
+
     /**----------------------------------------------------------------------------------------------------------
      * Protected methods for BackendStorage
      *

src/lib/interface/ibackend.php

@@ -299,6 +299,14 @@ interface IBackend {
      * @return Array
      */
     public function GetUserDetails($username);
+
+    /**
+     * Returns the username of the currently active user
+     *
+     * @access public
+     * @return Array
+     */
+    public function GetCurrentUsername();
 }
 
 ?>
\ No newline at end of file