grommunio / grommunio-web

plugins/smime/php/plugin.smime.php

Braces +27 added lines, -18 removed lines

@@ -167,8 +167,9 @@ 
 		if ($messageClass !== 'IPM.Note.SMIME' &&
 		    $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
 		    $messageClass !== 'IPM.Note.deferSMIME' &&
-		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
-			return;
+		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt') {
+					return;
+		}
 
 		$recipients = $data['action']['props']['smime'];
 		$missingCerts = [];
@@ -303,8 +304,9 @@ 
 				$importCert = file_get_contents($outcert);
 				$parsedImportCert = openssl_x509_parse($importCert);
 				$parsedUserCert = openssl_x509_parse($userCert);
-				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL)
-					continue;
+				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL) {
+									continue;
+				}
 
 				// CA Checks out
 				$caCerts = $this->extractCAs($tmpfname);
@@ -549,8 +551,9 @@ 
 	 * @param mixed $data
 	 */
 	public function onUploadCertificate($data) {
-		if ($data['sourcetype'] !== 'certificate')
-			return;
+		if ($data['sourcetype'] !== 'certificate') {
+					return;
+		}
 		$passphrase = $_POST['passphrase'];
 		$saveCert = false;
 		$tmpname = $data['tmpname'];
@@ -625,11 +628,13 @@ 
 		$props = mapi_getprops($message, [PR_MESSAGE_CLASS]);
 		$messageClass = $props[PR_MESSAGE_CLASS];
 
-		if (!isset($messageClass))
-			return;
+		if (!isset($messageClass)) {
+					return;
+		}
 		if (stripos($messageClass, 'IPM.Note.deferSMIME') === false &&
-		    stripos($messageClass, 'IPM.Note.SMIME') === false)
-			return;
+		    stripos($messageClass, 'IPM.Note.SMIME') === false) {
+					return;
+		}
 
 		// FIXME: for now return when we are going to sign but we don't have the passphrase set
 		// This should never happen sign
@@ -638,8 +643,9 @@ 
 		    $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
 		    $messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
 		    $messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
-		    !$encryptionStore->get('smime'))
-			return;
+		    !$encryptionStore->get('smime')) {
+					return;
+		}
 		// NOTE: setting message class to IPM.Note, so that mapi_inetmapi_imtoinet converts the message to plain email
 		// and doesn't fail when handling the attachments.
 		mapi_setprops($message, [PR_MESSAGE_CLASS => 'IPM.Note']);
@@ -883,8 +889,9 @@ 
 			foreach ($certs as $cert) {
 				$pubkey = mapi_msgstore_openentry($this->getStore(), $cert[PR_ENTRYID]);
 				$certificate = "";
-				if ($pubkey == false)
-					continue;
+				if ($pubkey == false) {
+									continue;
+				}
 				// retrieve pkcs#11 certificate from body
 				$stream = mapi_openproperty($pubkey, PR_BODY, IID_IStream, 0, 0);
 				$stat = mapi_stream_stat($stream);
@@ -1006,8 +1013,9 @@ 
 	 */
 	public function importCertificate($cert, $certData, $type = 'public', $force = false) {
 		$certEmail = getCertEmail($certData);
-		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private')
-			return;
+		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private') {
+					return;
+		}
 		$issued_by = "";
 		foreach (array_keys($certData['issuer']) as $key) {
 			$issued_by .= $key . '=' . $certData['issuer'][$key] . "\n";
@@ -1131,8 +1139,9 @@ 
 	 * @return array with properties
 	 */
 	public function getSenderAddress($mapiMessage) {
-		if (method_exists($GLOBALS['operations'], 'getSenderAddress'))
-			return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		if (method_exists($GLOBALS['operations'], 'getSenderAddress')) {
+					return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		}
 
 		$messageProps = mapi_getprops($mapiMessage, [PR_SENT_REPRESENTING_ENTRYID, PR_SENDER_ENTRYID]);
 		$senderEntryID = isset($messageProps[PR_SENT_REPRESENTING_ENTRYID]) ? $messageProps[PR_SENT_REPRESENTING_ENTRYID] : $messageProps[PR_SENDER_ENTRYID];

server/includes/modules/class.contactitemmodule.php

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
 	 * @return bool true on success or false on failure
 	 */
 	public function save($store, $parententryid, $entryid, $action) {
-		$properiesToDelete = [];		// create an array of properties which should be deleted
+		$properiesToDelete = []; // create an array of properties which should be deleted
 		// this array is passed to $GLOBALS['operations']->saveMessage() function
 
 		if (!$store && !$parententryid) {
@@ -449,7 +449,7 @@ 
 
 		// UTC time
 		$startDateUTC = $actionProps[$type];
-		$dueDateUTC = $actionProps[$type] + (24 * 60 * 60);	// ONE DAY is added to set duedate of item.
+		$dueDateUTC = $actionProps[$type] + (24 * 60 * 60); // ONE DAY is added to set duedate of item.
 
 		// get local time from UTC time
 		$recur = new Recurrence($store, []);

server/includes/modules/class.resolvenamesmodule.php

Spacing +2 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
 		$abHierarchyRows = mapi_table_queryallrows($hierarchyTable, [PR_AB_PROVIDER_ID, PR_ENTRYID]);
 
 		// Look for the 'Contacts Folders'
-		for ($i = 0,$len = count($abHierarchyRows); $i < $len; ++$i) {
+		for ($i = 0, $len = count($abHierarchyRows); $i < $len; ++$i) {
 			// Check if the folder matches the Contact Provider GUID
 			if ($abHierarchyRows[$i][PR_AB_PROVIDER_ID] == MUIDZCSAB) {
 				$abContactContainerEntryid = $abHierarchyRows[$i][PR_ENTRYID];
@@ -258,7 +258,7 @@ 
 			$abContactContainerHierarchyRows = mapi_table_queryallrows($abContactContainerHierarchyTable, [PR_DISPLAY_NAME, PR_OBJECT_TYPE, PR_ENTRYID]);
 
 			// Loop through all the contact folders found under the 'Contacts Folders' hierarchy
-			for ($j = 0,$len = count($abContactContainerHierarchyRows); $j < $len; ++$j) {
+			for ($j = 0, $len = count($abContactContainerHierarchyRows); $j < $len; ++$j) {
 				// Open, get contents table, restrict, sort and then merge the result in the list of $rows
 				$abContactFolder = mapi_ab_openentry($ab, $abContactContainerHierarchyRows[$j][PR_ENTRYID]);
 				$abContactFolderTable = mapi_folder_getcontentstable($abContactFolder, MAPI_DEFERRED_ERRORS);

server/includes/modules/class.addressbooklistmodule.php

Spacing +1 added lines, -1 removed lines

@@ -851,7 +851,7 @@
 								],
 								[
 									RES_OR,
-									$tempRestrictions,     // all group restrictions
+									$tempRestrictions, // all group restrictions
 								],
 							],
 						],

server/includes/modules/class.listmodule.php

Spacing +2 added lines, -2 removed lines

@@ -507,12 +507,12 @@
 		$data["search_meta"]["searchfolder_entryid"] = $entryid;
 		$data["search_meta"]["search_store_entryid"] = $action["store_entryid"];
 		$data["search_meta"]["searchstate"] = $searchState;
-		$data["search_meta"]["results"] = $numberOfResults;		// actual number of items that we are sending to client
+		$data["search_meta"]["results"] = $numberOfResults; // actual number of items that we are sending to client
 
 		$data["page"] = [];
 		$data["page"]["start"] = 0;
 		$data["page"]["rowcount"] = $rowCount;
-		$data["page"]["totalrowcount"] = $totalRowCount;	// total number of items
+		$data["page"]["totalrowcount"] = $totalRowCount; // total number of items
 
 		if (!empty($listData)) {
 			$data["item"] = array_merge([], $listData);

server/includes/modules/class.delegatesmodule.php

Spacing +1 added lines, -1 removed lines

@@ -575,7 +575,7 @@
 		];
 
 		$rule[PR_RULE_NAME] = '';
-		$rule[PR_RULE_PROVIDER_DATA] = '';		// 0 byte binary string
+		$rule[PR_RULE_PROVIDER_DATA] = ''; // 0 byte binary string
 		$rule[PR_RULE_STATE] = ST_ENABLED;
 		$rule[PR_RULE_LEVEL] = 0;
 		$rule[PR_RULE_SEQUENCE] = 0;

server/includes/modules/class.itemmodule.php

Indentation +4 added lines, -4 removed lines

@@ -727,10 +727,10 @@
 		/**
 		 * Function which copies or moves one or more items.
 		 *
-	 * @param resource $store         MAPI Message Store Object
-	 * @param string   $parententryid entryid of the folder
-	 * @param mixed    $entryids      list of entryids which will be copied or moved (in binary format)
-	 * @param array    $action        the action data, sent by the client
+		 * @param resource $store         MAPI Message Store Object
+		 * @param string   $parententryid entryid of the folder
+		 * @param mixed    $entryids      list of entryids which will be copied or moved (in binary format)
+		 * @param array    $action        the action data, sent by the client
 		 *
 		 * @return bool true on success or false on failure
 		 */

Switch Indentation +178 added lines, -178 removed lines

@@ -52,241 +52,241 @@
 					$entryid = $this->getActionEntryID($action);
 
 					switch ($actionType) {
-					case "open":
-						$this->open($store, $entryid, $action);
-						break;
+						case "open":
+							$this->open($store, $entryid, $action);
+							break;
 
-					case "save":
-						if (!$store || !$parententryid) {
-							/*
+						case "save":
+							if (!$store || !$parententryid) {
+								/*
 							 * if parententryid or storeentryid is not passed then we can take a guess that
 							 * it would be  a save operation but instead of depending on server to get default
 							 * parent and store client should always send parententryid and storeentryid
 							 *
 							 * we can also assume that user has permission to right in his own store
 							 */
-							$this->save($store, $parententryid, $entryid, $action);
-							break;
-						}
-						/*
+								$this->save($store, $parententryid, $entryid, $action);
+								break;
+							}
+							/*
 						 * The "message_action" object has been set, check the action_type field for
 						 * the exact action which must be taken.
 						 * Supported actions:
 						 *   - acceptmeetingrequest: attendee has accepted mr
 						 *   - declineMeetingRequest: attendee has declined mr
 						 */
-						if (!isset($action["message_action"], $action["message_action"]["action_type"])) {
-							$this->save($store, $parententryid, $entryid, $action);
-							break;
-						}
-
-						switch ($action["message_action"]["action_type"]) {
-						case "declineMeetingRequest":
-						case "acceptMeetingRequest":
-							$message = $GLOBALS["operations"]->openMessage($store, $entryid);
-							$basedate = (isset($action['basedate']) ? $action['basedate'] : false);
-							$delete = false;
-
-							if ($basedate) {
-								$recurrence = new Recurrence($store, $message);
-								$exceptionatt = $recurrence->getExceptionAttachment($basedate);
-								if ($exceptionatt) {
-									// get properties of existing exception.
-									$exceptionattProps = mapi_getprops($exceptionatt, [PR_ATTACH_NUM]);
-									$attach_num = $exceptionattProps[PR_ATTACH_NUM];
-								}
+							if (!isset($action["message_action"], $action["message_action"]["action_type"])) {
+								$this->save($store, $parententryid, $entryid, $action);
+								break;
 							}
 
-							/**
+							switch ($action["message_action"]["action_type"]) {
+								case "declineMeetingRequest":
+								case "acceptMeetingRequest":
+									$message = $GLOBALS["operations"]->openMessage($store, $entryid);
+									$basedate = (isset($action['basedate']) ? $action['basedate'] : false);
+									$delete = false;
+
+									if ($basedate) {
+										$recurrence = new Recurrence($store, $message);
+										$exceptionatt = $recurrence->getExceptionAttachment($basedate);
+										if ($exceptionatt) {
+											// get properties of existing exception.
+											$exceptionattProps = mapi_getprops($exceptionatt, [PR_ATTACH_NUM]);
+											$attach_num = $exceptionattProps[PR_ATTACH_NUM];
+										}
+									}
+
+									/**
 							 * Get message class from original message. This can be changed to
 							 * IPM.Appointment if the item is a Meeting Request in the maillist.
 							 * After Accepting/Declining the message is moved and changed.
 							 */
-							$originalMessageProps = mapi_getprops($message, [PR_MESSAGE_CLASS]);
-							$req = new Meetingrequest($store, $message, $GLOBALS["mapisession"]->getSession(), $this->directBookingMeetingRequest);
+									$originalMessageProps = mapi_getprops($message, [PR_MESSAGE_CLASS]);
+									$req = new Meetingrequest($store, $message, $GLOBALS["mapisession"]->getSession(), $this->directBookingMeetingRequest);
 
-							// Update extra body information
-							if (isset($action["message_action"]['meetingTimeInfo']) && !empty($action["message_action"]['meetingTimeInfo'])) {
-								$req->setMeetingTimeInfo($action["message_action"]['meetingTimeInfo']);
-								unset($action["message_action"]['meetingTimeInfo']);
-							}
+									// Update extra body information
+									if (isset($action["message_action"]['meetingTimeInfo']) && !empty($action["message_action"]['meetingTimeInfo'])) {
+										$req->setMeetingTimeInfo($action["message_action"]['meetingTimeInfo']);
+										unset($action["message_action"]['meetingTimeInfo']);
+									}
 
-							// sendResponse flag if it is set then send the mail response to the organzer.
-							$sendResponse = true;
-							if (isset($action["message_action"]["sendResponse"]) && $action["message_action"]["sendResponse"] == false) {
-								$sendResponse = false;
-							}
+									// sendResponse flag if it is set then send the mail response to the organzer.
+									$sendResponse = true;
+									if (isset($action["message_action"]["sendResponse"]) && $action["message_action"]["sendResponse"] == false) {
+										$sendResponse = false;
+									}
 
-							// @FIXME: fix body
-							$body = false;
-							if (isset($action["props"]["isHTML"]) && $action["props"]["isHTML"] === true) {
-								$body = isset($action["props"]["html_body"]) ? $action["props"]["html_body"] : false;
-							}
-							else {
-								$body = isset($action["props"]["body"]) ? $action["props"]["body"] : false;
-							}
+									// @FIXME: fix body
+									$body = false;
+									if (isset($action["props"]["isHTML"]) && $action["props"]["isHTML"] === true) {
+										$body = isset($action["props"]["html_body"]) ? $action["props"]["html_body"] : false;
+									}
+									else {
+										$body = isset($action["props"]["body"]) ? $action["props"]["body"] : false;
+									}
 
-							if ($action["message_action"]["action_type"] == "acceptMeetingRequest") {
-								$tentative = $action["message_action"]["responseType"] === olResponseTentative;
-								$newProposedStartTime = isset($action["message_action"]["proposed_starttime"]) ? $action["message_action"]["proposed_starttime"] : false;
-								$newProposedEndTime = isset($action["message_action"]["proposed_endtime"]) ? $action["message_action"]["proposed_endtime"] : false;
+									if ($action["message_action"]["action_type"] == "acceptMeetingRequest") {
+										$tentative = $action["message_action"]["responseType"] === olResponseTentative;
+										$newProposedStartTime = isset($action["message_action"]["proposed_starttime"]) ? $action["message_action"]["proposed_starttime"] : false;
+										$newProposedEndTime = isset($action["message_action"]["proposed_endtime"]) ? $action["message_action"]["proposed_endtime"] : false;
 
-								// We are accepting MR from preview-read-mail so set delete the actual mail flag.
-								$delete = $req->isMeetingRequest($originalMessageProps[PR_MESSAGE_CLASS]);
+										// We are accepting MR from preview-read-mail so set delete the actual mail flag.
+										$delete = $req->isMeetingRequest($originalMessageProps[PR_MESSAGE_CLASS]);
 
-								$req->doAccept($tentative, $sendResponse, $delete, $newProposedStartTime, $newProposedEndTime, $body, true, $store, $basedate);
-							}
-							else {
-								$delete = $req->doDecline($sendResponse, $basedate, $body);
-							}
+										$req->doAccept($tentative, $sendResponse, $delete, $newProposedStartTime, $newProposedEndTime, $body, true, $store, $basedate);
+									}
+									else {
+										$delete = $req->doDecline($sendResponse, $basedate, $body);
+									}
 
-							/**
+									/**
 							 * Now if the item is the Meeting Request that was sent to the attendee
 							 * it is removed when the user has clicked on Accept/Decline. If the
 							 * item is the appointment in the calendar it will not be moved. To only
 							 * notify the bus when the item is a Meeting Request we are going to
 							 * check the PR_MESSAGE_CLASS and see if it is "IPM.Meeting*".
 							 */
-							$messageProps = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
+									$messageProps = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
 
-							// if opened appointment is exception then it will add
-							// the attach_num and basedate in messageProps.
-							if (isset($attach_num)) {
-								$messageProps[PR_ATTACH_NUM] = [$attach_num];
-									$messageProps[$this->properties["basedate"]] = $basedate;
-							}
+									// if opened appointment is exception then it will add
+									// the attach_num and basedate in messageProps.
+									if (isset($attach_num)) {
+										$messageProps[PR_ATTACH_NUM] = [$attach_num];
+											$messageProps[$this->properties["basedate"]] = $basedate;
+									}
 
-							if ($delete) {
-								// send TABLE_DELETE event because the message has moved
-								$this->sendFeedback(true);
-								$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), TABLE_DELETE, $messageProps);
-							}
-							else {
-								$this->addActionData("update", ["item" => Conversion::mapMAPI2XML($this->properties, $messageProps)]);
-								$GLOBALS["bus"]->addData($this->getResponseData());
+									if ($delete) {
+										// send TABLE_DELETE event because the message has moved
+										$this->sendFeedback(true);
+										$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), TABLE_DELETE, $messageProps);
+									}
+									else {
+										$this->addActionData("update", ["item" => Conversion::mapMAPI2XML($this->properties, $messageProps)]);
+										$GLOBALS["bus"]->addData($this->getResponseData());
 
-								// send TABLE_SAVE event because an occurrence is deleted
-								$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), TABLE_SAVE, $messageProps);
-							}
+										// send TABLE_SAVE event because an occurrence is deleted
+										$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), TABLE_SAVE, $messageProps);
+									}
 
-							break;
+									break;
 
-						case "acceptTaskRequest":
-						case "declineTaskRequest":
-							$message = $GLOBALS["operations"]->openMessage($store, $entryid);
+								case "acceptTaskRequest":
+								case "declineTaskRequest":
+									$message = $GLOBALS["operations"]->openMessage($store, $entryid);
 
-							if (isset($action["props"]) && !empty($action["props"])) {
-								$properties = $GLOBALS["properties"]->getTaskProperties();
-								mapi_setprops($message, Conversion::mapXML2MAPI($properties, $action["props"]));
-								mapi_savechanges($message);
-							}
-							// The task may be a delegated task, do an update if needed (will fail for non-delegated tasks)
-							$tr = new TaskRequest($store, $message, $GLOBALS["mapisession"]->getSession());
-							$isAccept = $action["message_action"]["action_type"] == "acceptTaskRequest";
-							if (isset($action["message_action"]["task_comments_info"]) && !empty($action["message_action"]["task_comments_info"])) {
-								$tr->setTaskCommentsInfo($action["message_action"]["task_comments_info"]);
-							}
-							if ($isAccept) {
-								$result = $tr->doAccept();
-							}
-							else {
-								$result = $tr->doDecline();
-							}
+									if (isset($action["props"]) && !empty($action["props"])) {
+										$properties = $GLOBALS["properties"]->getTaskProperties();
+										mapi_setprops($message, Conversion::mapXML2MAPI($properties, $action["props"]));
+										mapi_savechanges($message);
+									}
+									// The task may be a delegated task, do an update if needed (will fail for non-delegated tasks)
+									$tr = new TaskRequest($store, $message, $GLOBALS["mapisession"]->getSession());
+									$isAccept = $action["message_action"]["action_type"] == "acceptTaskRequest";
+									if (isset($action["message_action"]["task_comments_info"]) && !empty($action["message_action"]["task_comments_info"])) {
+										$tr->setTaskCommentsInfo($action["message_action"]["task_comments_info"]);
+									}
+									if ($isAccept) {
+										$result = $tr->doAccept();
+									}
+									else {
+										$result = $tr->doDecline();
+									}
 
-							$this->sendFeedback(true);
-							if ($result !== false) {
-								$GLOBALS["bus"]->notify(bin2hex($result[PR_PARENT_ENTRYID]), TABLE_DELETE, $result);
-							}
+									$this->sendFeedback(true);
+									if ($result !== false) {
+										$GLOBALS["bus"]->notify(bin2hex($result[PR_PARENT_ENTRYID]), TABLE_DELETE, $result);
+									}
 
-							$props = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
-							if (!$tr->isTaskRequest()) {
-								unset($props[PR_MESSAGE_CLASS]);
-								$GLOBALS["bus"]->notify(bin2hex($props[PR_PARENT_ENTRYID]), $isAccept ? TABLE_SAVE : TABLE_DELETE, $props);
+									$props = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
+									if (!$tr->isTaskRequest()) {
+										unset($props[PR_MESSAGE_CLASS]);
+										$GLOBALS["bus"]->notify(bin2hex($props[PR_PARENT_ENTRYID]), $isAccept ? TABLE_SAVE : TABLE_DELETE, $props);
+									}
+									break;
+
+								case "copy":
+								case "move":
+									$this->copy($store, $parententryid, $entryid, $action);
+									break;
+
+								case "reply":
+								case "replyall":
+								case "forward":
+								default:
+									$this->save($store, $parententryid, $entryid, $action);
 							}
-							break;
-
-						case "copy":
-						case "move":
-							$this->copy($store, $parententryid, $entryid, $action);
-							break;
-
-						case "reply":
-						case "replyall":
-						case "forward":
-						default:
-							$this->save($store, $parententryid, $entryid, $action);
-						}
 						break;
 
-					case "delete":
-						$subActionType = false;
-						if (isset($action["message_action"], $action["message_action"]["action_type"])) {
-							$subActionType = $action["message_action"]["action_type"];
-						}
+						case "delete":
+							$subActionType = false;
+							if (isset($action["message_action"], $action["message_action"]["action_type"])) {
+								$subActionType = $action["message_action"]["action_type"];
+							}
 
-						/*
+							/*
 						 * The "message_action" object has been set, check the action_type field for
 						 * the exact action which must be taken.
 						 * Supported actions:
 						 *   - cancelInvitation: organizer cancels already scheduled meeting
 						 *   - removeFromCalendar: attendee receives meeting cancellation and wants to remove item from calendar
 						 */
-						switch ($subActionType) {
-						case "removeFromCalendar":
-							$basedate = (isset($action['basedate']) && !empty($action['basedate'])) ? $action['basedate'] : false;
-
-							$this->removeFromCalendar($store, $entryid, $basedate, $this->directBookingMeetingRequest);
-							$this->sendFeedback(true);
-							break;
-
-						case "cancelInvitation":
-							$this->cancelInvitation($store, $entryid, $action, $this->directBookingMeetingRequest);
-							$this->sendFeedback(true);
-							break;
-
-						case "declineMeeting":
-							// @FIXME can we somehow merge declineMeeting and declineMeetingRequest sub actions?
-							$message = $GLOBALS["operations"]->openMessage($store, $entryid);
-							$basedate = (isset($action['basedate']) && !empty($action['basedate'])) ? $action['basedate'] : false;
-
-							$req = new Meetingrequest($store, $message, $GLOBALS["mapisession"]->getSession(), $this->directBookingMeetingRequest);
-
-							// @FIXME: may be we can remove this body check any get it while declining meeting 'body'
-							$body = false;
-							if (isset($action["props"]["isHTML"]) && $action["props"]["isHTML"] === true) {
-								$body = isset($action["props"]["html_body"]) ? $action["props"]["html_body"] : false;
-							}
-							else {
-								$body = isset($action["props"]["body"]) ? $action["props"]["body"] : false;
-							}
-							$req->doDecline(true, $basedate, $body);
+							switch ($subActionType) {
+								case "removeFromCalendar":
+									$basedate = (isset($action['basedate']) && !empty($action['basedate'])) ? $action['basedate'] : false;
+
+									$this->removeFromCalendar($store, $entryid, $basedate, $this->directBookingMeetingRequest);
+									$this->sendFeedback(true);
+									break;
+
+								case "cancelInvitation":
+									$this->cancelInvitation($store, $entryid, $action, $this->directBookingMeetingRequest);
+									$this->sendFeedback(true);
+									break;
+
+								case "declineMeeting":
+									// @FIXME can we somehow merge declineMeeting and declineMeetingRequest sub actions?
+									$message = $GLOBALS["operations"]->openMessage($store, $entryid);
+									$basedate = (isset($action['basedate']) && !empty($action['basedate'])) ? $action['basedate'] : false;
+
+									$req = new Meetingrequest($store, $message, $GLOBALS["mapisession"]->getSession(), $this->directBookingMeetingRequest);
+
+									// @FIXME: may be we can remove this body check any get it while declining meeting 'body'
+									$body = false;
+									if (isset($action["props"]["isHTML"]) && $action["props"]["isHTML"] === true) {
+										$body = isset($action["props"]["html_body"]) ? $action["props"]["html_body"] : false;
+									}
+									else {
+										$body = isset($action["props"]["body"]) ? $action["props"]["body"] : false;
+									}
+									$req->doDecline(true, $basedate, $body);
 
-							$messageProps = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
-							$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), $basedate ? TABLE_SAVE : TABLE_DELETE, $messageProps);
+									$messageProps = mapi_getprops($message, [PR_ENTRYID, PR_STORE_ENTRYID, PR_PARENT_ENTRYID]);
+									$GLOBALS["bus"]->notify(bin2hex($messageProps[PR_PARENT_ENTRYID]), $basedate ? TABLE_SAVE : TABLE_DELETE, $messageProps);
 
-							break;
+									break;
 
-						case "snooze":
-						case "dismiss":
-							$this->delete($store, $parententryid, $entryid, $action);
-							break;
+								case "snooze":
+								case "dismiss":
+									$this->delete($store, $parententryid, $entryid, $action);
+									break;
 
-						default:
-							// Deleting an occurrence means that we have to save the message to
-							// generate an exception. So when the basedate is provided, we actually
-							// perform a save rather then delete.
-							if (isset($action['basedate']) && !empty($action['basedate'])) {
-								$this->save($store, $parententryid, $entryid, $action, "delete");
-							}
-							else {
-								$this->delete($store, $parententryid, $entryid, $action);
+								default:
+									// Deleting an occurrence means that we have to save the message to
+									// generate an exception. So when the basedate is provided, we actually
+									// perform a save rather then delete.
+									if (isset($action['basedate']) && !empty($action['basedate'])) {
+										$this->save($store, $parententryid, $entryid, $action, "delete");
+									}
+									else {
+										$this->delete($store, $parententryid, $entryid, $action);
+									}
+									break;
 							}
-							break;
-						}
 						break;
 
-					default:
-						$this->handleUnknownActionType($actionType);
+						default:
+							$this->handleUnknownActionType($actionType);
 					}
 				}
 				catch (MAPIException $e) {

server/includes/modules/class.hierarchymodule.php

Spacing +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 								throw new MAPIException(null, MAPI_E_NO_ACCESS);
 							}
 
-							$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function ($item) {
+							$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function($item) {
 								return $item['props']['access'] === 0;
 							});
 							if (count($noPermissionFolders) >= $folders) {

server/includes/core/class.properties.php

Spacing +22 added lines, -22 removed lines

@@ -247,14 +247,14 @@ 
 			$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;
 			$properties["flag_request"] = "PT_STRING8:PSETID_Common:" . PidLidFlagRequest;
 			$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;
-			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence;                                     // AppointmentSequenceNumber
-			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
+			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence; // AppointmentSequenceNumber
+			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203"; // AppointmentLastSequence
 			$properties["busystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidBusyStatus;
 			$properties["intendedbusystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidIntendedBusyStatus;
 			$properties["start"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["responselocation"] = "PT_STRING8:PSETID_Meeting:0x2";
 			$properties["location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
-			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229";            // PidLidFInvited, MeetingRequestWasSent
+			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229"; // PidLidFInvited, MeetingRequestWasSent
 			$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,11 @@ 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
 			$properties["clipstart"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;
 			$properties["clipend"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;
-			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD";                         // StartRecurTime
-			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE";                         // StartRecurTime
-			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF";                           // EndRecurDate
-			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10";                          // EndRecurTime
-			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";                          // LID_IS_EXCEPTION
+			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD"; // StartRecurTime
+			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE"; // StartRecurTime
+			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF"; // EndRecurDate
+			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10"; // EndRecurTime
+			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 			// Propose new time properties
 			$properties["proposed_start_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
 			$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedEndWhole;
@@ -645,7 +645,7 @@ 
 			$properties = [];
 			$properties["entryid"] = PR_ENTRYID;
 			$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-			$properties["store_entryid"] = PR_STORE_ENTRYID;	// is this required ???
+			$properties["store_entryid"] = PR_STORE_ENTRYID; // is this required ???
 			$properties["icon_index"] = PR_ICON_INDEX;
 			$properties["message_class"] = PR_MESSAGE_CLASS;
 			$properties["message_flags"] = PR_MESSAGE_FLAGS;
@@ -961,9 +961,9 @@ 
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
 			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;	// ClipStart
-			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;		// ClipEnd
-			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
+			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart; // ClipStart
+			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd; // ClipEnd
+			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			// Propose new time properties
 			$properties["proposed_start_date"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
@@ -1250,18 +1250,18 @@ 
 			$properties["object_type"] = PR_OBJECT_TYPE;
 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;				// PidLidReminderSet
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta;			// PidLidReminderDelta
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime;			// PidLidReminderTime
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;				// PidLidReminderSignalTime
-
-			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate;				// PidLidTaskDueDate
-			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate;			// PidLidTaskStartDate
-			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
-			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
+			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet; // PidLidReminderSet
+			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta; // PidLidReminderDelta
+			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime; // PidLidReminderTime
+			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime; // PidLidReminderSignalTime
+
+			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate; // PidLidTaskDueDate
+			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate; // PidLidTaskStartDate
+			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107"; // PidLidTaskResetReminder
+			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126"; // PidLidTaskFRecurring
 			$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
 
-			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;			// PidLidRecurring
+			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring; // PidLidRecurring
 			$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;