grommunio / grommunio-web

server/includes/modules/class.itemmodule.php

Switch Indentation +177 added lines, -177 removed lines

@@ -50,240 +50,240 @@
 					$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[$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[$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) {

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 		 */
 		public function execute() {
 			foreach ($this->data as $actionType => $action) {
-				if (!isset($actionType))
-					continue;
+				if (!isset($actionType)) {
+									continue;
+				}
 				try {
 					$store = $this->getActionStore($action);
 					$parententryid = $this->getActionParentEntryID($action);
@@ -644,8 +645,9 @@ 
 		 * @return bool true on success or false on failure
 		 */
 		public function delete($store, $parententryid, $entryid, $action) {
-			if (!$store || !$parententryid || !$entryid)
-				return;
+			if (!$store || !$parententryid || !$entryid) {
+							return;
+			}
 			$props = [];
 			$props[PR_PARENT_ENTRYID] = $parententryid;
 			$props[PR_ENTRYID] = $entryid;

server/includes/core/class.operations.php

Indentation +5 added lines, -5 removed lines

@@ -2105,9 +2105,9 @@ 
 						$props = mapi_getprops($message, $properties);
 						// Do not update timezone information if the appointment times haven't changed
 						if (!isset($action['props']['commonstart']) &&
-						    !isset($action['props']['commonend']) &&
-						    !isset($action['props']['startdate']) &&
-						    !isset($action['props']['enddate'])
+							!isset($action['props']['commonend']) &&
+							!isset($action['props']['startdate']) &&
+							!isset($action['props']['enddate'])
 							) {
 							unset($action['props']['tzdefstart'], $action['props']['tzdefend']);
 						}
@@ -2832,7 +2832,7 @@ 
 		 * @return bool true if action succeeded, false if not
 		 */
 		public function deleteMessages($store, $parententryid, $entryids,
-		    $softDelete = false, $unread = false)
+			$softDelete = false, $unread = false)
 		{
 			$result = false;
 			if (!is_array($entryids)) {
@@ -2856,7 +2856,7 @@ 
 				$msgprops = mapi_getprops($defaultstore, [PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER]);
 
 				if (!isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) ||
-				    $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid) {
+					$msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid) {
 					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
 					break;
 				}

Switch Indentation +53 added lines, -53 removed lines

@@ -2844,68 +2844,68 @@
 			$msgprops = mapi_getprops($store, [PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER, PR_IPM_OUTBOX_ENTRYID]);
 
 			switch ($msgprops[PR_MDB_PROVIDER]) {
-			case ZARAFA_STORE_DELEGATE_GUID:
-				$softDelete = $softDelete || defined('ENABLE_DEFAULT_SOFT_DELETE') ? ENABLE_DEFAULT_SOFT_DELETE : false;
-				// with a store from an other user we need our own waste basket...
-				if (isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) && $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid || $softDelete) {
-					// except when it is the waste basket itself
-					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
-					break;
-				}
-				$defaultstore = $GLOBALS["mapisession"]->getDefaultMessageStore();
-				$msgprops = mapi_getprops($defaultstore, [PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER]);
+				case ZARAFA_STORE_DELEGATE_GUID:
+					$softDelete = $softDelete || defined('ENABLE_DEFAULT_SOFT_DELETE') ? ENABLE_DEFAULT_SOFT_DELETE : false;
+					// with a store from an other user we need our own waste basket...
+					if (isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) && $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid || $softDelete) {
+						// except when it is the waste basket itself
+						$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+						break;
+					}
+					$defaultstore = $GLOBALS["mapisession"]->getDefaultMessageStore();
+					$msgprops = mapi_getprops($defaultstore, [PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER]);
 
-				if (!isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) ||
-				    $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid) {
-					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+					if (!isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) ||
+				    	$msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid) {
+						$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+						break;
+					}
+					try {
+						$result = $this->copyMessages($store, $parententryid, $defaultstore, $msgprops[PR_IPM_WASTEBASKET_ENTRYID], $entryids, [], true);
+					}
+					catch (MAPIException $e) {
+						$e->setHandled();
+						// if moving fails, try normal delete
+						$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+					}
 					break;
-				}
-				try {
-					$result = $this->copyMessages($store, $parententryid, $defaultstore, $msgprops[PR_IPM_WASTEBASKET_ENTRYID], $entryids, [], true);
-				}
-				catch (MAPIException $e) {
-					$e->setHandled();
-					// if moving fails, try normal delete
-					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
-				}
-				break;
 
-			case ZARAFA_STORE_ARCHIVER_GUID:
-			case ZARAFA_STORE_PUBLIC_GUID:
-				// always delete in public store and archive store
-				$result = mapi_folder_deletemessages($folder, $entryids, $flags);
-				break;
-
-			case ZARAFA_SERVICE_GUID:
-				// delete message when in your own waste basket, else move it to the waste basket
-				if (isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) && $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid || $softDelete == true) {
+				case ZARAFA_STORE_ARCHIVER_GUID:
+				case ZARAFA_STORE_PUBLIC_GUID:
+					// always delete in public store and archive store
 					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
 					break;
-				}
-				try {
-					// if the message is deleting from outbox then first delete the
-					// message from an outgoing queue.
-					if (function_exists("mapi_msgstore_abortsubmit") && isset($msgprops[PR_IPM_OUTBOX_ENTRYID]) && $msgprops[PR_IPM_OUTBOX_ENTRYID] === $parententryid) {
-						foreach ($entryids as $entryid) {
-							$message = mapi_msgstore_openentry($store, $entryid);
-							$messageProps = mapi_getprops($message, [PR_DEFERRED_SEND_TIME]);
-							if (isset($messageProps[PR_DEFERRED_SEND_TIME])) {
-								mapi_msgstore_abortsubmit($store, $entryid);
+
+				case ZARAFA_SERVICE_GUID:
+					// delete message when in your own waste basket, else move it to the waste basket
+					if (isset($msgprops[PR_IPM_WASTEBASKET_ENTRYID]) && $msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid || $softDelete == true) {
+						$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+						break;
+					}
+					try {
+						// if the message is deleting from outbox then first delete the
+						// message from an outgoing queue.
+						if (function_exists("mapi_msgstore_abortsubmit") && isset($msgprops[PR_IPM_OUTBOX_ENTRYID]) && $msgprops[PR_IPM_OUTBOX_ENTRYID] === $parententryid) {
+							foreach ($entryids as $entryid) {
+								$message = mapi_msgstore_openentry($store, $entryid);
+								$messageProps = mapi_getprops($message, [PR_DEFERRED_SEND_TIME]);
+								if (isset($messageProps[PR_DEFERRED_SEND_TIME])) {
+									mapi_msgstore_abortsubmit($store, $entryid);
+								}
 							}
 						}
+						$result = $this->copyMessages($store, $parententryid, $store, $msgprops[PR_IPM_WASTEBASKET_ENTRYID], $entryids, [], true);
 					}
-					$result = $this->copyMessages($store, $parententryid, $store, $msgprops[PR_IPM_WASTEBASKET_ENTRYID], $entryids, [], true);
-				}
-				catch (MAPIException $e) {
-					if ($e->getCode() === MAPI_E_NOT_IN_QUEUE || $e->getCode() === MAPI_E_UNABLE_TO_ABORT) {
-						throw $e;
-					}
+					catch (MAPIException $e) {
+						if ($e->getCode() === MAPI_E_NOT_IN_QUEUE || $e->getCode() === MAPI_E_UNABLE_TO_ABORT) {
+							throw $e;
+						}
 
-					$e->setHandled();
-					// if moving fails, try normal delete
-					$result = mapi_folder_deletemessages($folder, $entryids, $flags);
-				}
-				break;
+						$e->setHandled();
+						// if moving fails, try normal delete
+						$result = mapi_folder_deletemessages($folder, $entryids, $flags);
+					}
+					break;
 			}
 
 			return $result;

Braces +15 added lines, -11 removed lines

@@ -1059,8 +1059,9 @@ 
 		 */
 		public function renameFolder($store, $entryid, $name, &$folderProps) {
 			$folder = mapi_msgstore_openentry($store, $entryid);
-			if (!$folder)
-				return false;
+			if (!$folder) {
+							return false;
+			}
 			$result = false;
 			$folderProps = mapi_getprops($folder, [PR_ENTRYID, PR_STORE_ENTRYID, PR_DISPLAY_NAME]);
 			/*
@@ -2088,7 +2089,8 @@ 
 			if (!empty($action['props']['timezone_iana'])) {
 				try {
 					$tzdef = mapi_ianatz_to_tzdef($action['props']['timezone_iana']);
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 				}
 				if ($tzdef !== false) {
 					$action['props']['tzdefstart'] = $action['props']['tzdefend'] = bin2hex($tzdef);
@@ -2611,8 +2613,9 @@ 
 			$storeprops = mapi_getprops($store, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_ENTRYID]);
 			$origStoreprops = mapi_getprops($origStore, [PR_ENTRYID]);
 
-			if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID]))
-				return false;
+			if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID])) {
+							return false;
+			}
 			if (isset($storeprops[PR_IPM_SENTMAIL_ENTRYID])) {
 				$props[PR_SENTMAIL_ENTRYID] = $storeprops[PR_IPM_SENTMAIL_ENTRYID];
 			}
@@ -2779,8 +2782,9 @@ 
 				$message = $this->saveMessage($store, $entryid, $storeprops[PR_IPM_OUTBOX_ENTRYID], $props, $messageProps, $recipients, $attachments, [], $copyFromMessage, $copyAttachments, $copyRecipients, $copyInlineAttachmentsOnly, true, true, $isPlainText);
 			}
 
-			if (!$message)
-				return false;
+			if (!$message) {
+							return false;
+			}
 			// Allowing to hook in just before the data sent away to be sent to the client
 			$GLOBALS['PluginManager']->triggerHook('server.core.operations.submitmessage', [
 				'moduleObject' => $this,
@@ -2832,8 +2836,7 @@ 
 		 * @return bool true if action succeeded, false if not
 		 */
 		public function deleteMessages($store, $parententryid, $entryids,
-		    $softDelete = false, $unread = false)
-		{
+		    $softDelete = false, $unread = false) {
 			$result = false;
 			if (!is_array($entryids)) {
 				$entryids = [$entryids];
@@ -3059,8 +3062,9 @@ 
 
 			if (array_search(strtolower($foldername), $folderNames) !== false) {
 				$i = 2;
-				while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false)
-					++$i;
+				while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false) {
+									++$i;
+				}
 				$foldername .= " ($i)";
 			}