grommunio / grommunio-sync

lib/core/statemanager.php

Spacing +2 added lines, -2 removed lines

@@ -520,8 +520,8 @@
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
-			mt_rand(0, 0x0FFF) | 0x4000,
-			mt_rand(0, 0x3FFF) | 0x8000,
+			mt_rand(0, 0x0FFF)|0x4000,
+			mt_rand(0, 0x3FFF)|0x8000,
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF)

mapi/class.recurrence.php

Spacing +12 added lines, -12 removed lines

@@ -734,7 +734,7 @@ 
 			$props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
 			mapi_setprops($attachment, $props);
 
-			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
+			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE|MAPI_MODIFY);
 
 			if ($copy_attach_from) {
 				$attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
@@ -1114,13 +1114,13 @@ 
 			// Remove all deleted recipients
 			if (isset($exception_recips['remove'])) {
 				foreach ($exception_recips['remove'] as &$recip) {
-					if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+					if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
+						$recip[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
 					}
 					else {
-						$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+						$recip[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
 					}
-					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;        // No Response required
+					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
 				}
 				unset($recip);
 				mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1190,13 +1190,13 @@ 
 
 						// If recipient is not in list of deleted recipient, add him
 						if (!$foundInDeletedRecipients) {
-							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-								$recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
+								$recipient[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
 							}
 							else {
-								$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+								$recipient[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
 							}
-							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;    // No Response required
+							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
 							$deletedRecipients[] = $recipient;
 						}
 					}
@@ -1256,12 +1256,12 @@ 
 			$hasOrganizer = false;
 			// Check if meeting already has an organizer.
 			foreach ($recipients as $key => $recipient) {
-				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
+				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
 					$hasOrganizer = true;
 				}
 				elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
 					// Recipients for an occurrence
-					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
 				}
 			}
 
@@ -1275,7 +1275,7 @@ 
 				$organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
 				$organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
 				$organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-				$organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
+				$organizer[PR_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
 				$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
 
 				// Add organizer to recipients list.

mapi/mapi.util.php

Spacing +2 added lines, -2 removed lines

@@ -226,7 +226,7 @@ 
 			RES_OR,
 			[
 				[
-					RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+					RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
 					[
 						[
 							RES_PROPERTY,
@@ -256,7 +256,7 @@ 
 					],
 				],
 			], // EXISTS OR
-		];        // global OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

mapi/class.meetingrequest.php

Spacing +18 added lines, -18 removed lines

@@ -152,15 +152,15 @@ 
 		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
 		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
 		$properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201';                    // AppointmentSequenceNumber
-		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';            // AppointmentLastSequence
+		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201'; // AppointmentSequenceNumber
+		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203'; // AppointmentLastSequence
 		$properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
 		$properties['busystatus'] = 'PT_LONG:PSETID_Appointment:0x8205';
 		$properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:0x8224';
 		$properties['start'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
 		$properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
 		$properties['location'] = 'PT_STRING8:PSETID_Appointment:0x8208';
-		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';        // PidLidFInvited, MeetingRequestWasSent
+		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229'; // PidLidFInvited, MeetingRequestWasSent
 		$properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
 		$properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:0x820e';
 		$properties['flagdueby'] = 'PT_SYSTIME:PSETID_Common:0x8560';
@@ -169,11 +169,11 @@ 
 		$properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:0x8223';
 		$properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:0x8235';
 		$properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:0x8236';
-		$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
 		$properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
 		// Propose new time properties
 		$properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8250';
@@ -545,7 +545,7 @@ 
 		$listProperties['rcvd_representing_search_key'] = PR_RCVD_REPRESENTING_SEARCH_KEY;
 		$messageProps = mapi_getprops($this->message, $listProperties);
 
-		$goid = $messageProps[$this->proptags['goid']];    // GlobalID (0x3)
+		$goid = $messageProps[$this->proptags['goid']]; // GlobalID (0x3)
 		if (!isset($goid)) {
 			return;
 		}
@@ -1443,7 +1443,7 @@ 
 		$props[$this->proptags['goid2']] = $goid;
 
 		if (!isset($props[$this->proptags['updatecounter']])) {
-			$props[$this->proptags['updatecounter']] = 0;            // OL also starts sequence no with zero.
+			$props[$this->proptags['updatecounter']] = 0; // OL also starts sequence no with zero.
 			$props[$this->proptags['last_updatecounter']] = 0;
 		}
 
@@ -2292,12 +2292,12 @@ 
 		$hasOrganizer = false;
 		// Check if meeting already has an organizer.
 		foreach ($recipients as $key => $recipient) {
-			if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
+			if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
 				$hasOrganizer = true;
 			}
 			elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
 				// Recipients for an occurrence
-				$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+				$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
 			}
 		}
 
@@ -2311,7 +2311,7 @@ 
 			$organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
 			$organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
 			$organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-			$organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
+			$organizer[PR_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
 			$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
 
 			// Add organizer to recipients list.
@@ -2498,7 +2498,7 @@ 
 				[
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+						RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -2780,7 +2780,7 @@ 
 				[
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+						RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -3012,7 +3012,7 @@ 
 				$restriction[1][] = [
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+						RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -3109,7 +3109,7 @@ 
 									[
 										RES_PROPERTY,
 										[
-											RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+											RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
 											ULPROPTAG => PR_RECIPIENT_TYPE,
 											VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 										],
@@ -3216,7 +3216,7 @@ 
 			$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
 			$newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
 			$newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
-			$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;    // HIGH Importance
+			$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH; // HIGH Importance
 			if (isset($newmessageprops[PR_SUBJECT])) {
 				$newmessageprops[PR_SUBJECT] = _('Canceled: ') . $newmessageprops[PR_SUBJECT];
 			}