grommunio / grommunio-sync

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];
 			}

mapi/class.baserecurrence.php

Spacing +7 added lines, -7 removed lines

@@ -842,12 +842,12 @@ 
 
 								$dayofweek = gmdate("w", $monthbegindow);
 								for ($i = 0; $i < 7; ++$i) {
-									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 										$day = gmdate("j", $monthbegindow) - $i;
 
 										break;
 									}
-									if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+									if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 										$day = (($nday - 1) * 7) + ($i + 1);
 
 										break;
@@ -887,12 +887,12 @@ 
 							// Set start on the right day
 							$dayofweek = gmdate("w", $monthbegindow);
 							for ($i = 0; $i < 7; ++$i) {
-								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 									$day = $i;
 
 									break;
 								}
-								if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+								if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 									$day = ($nday - 1) * 7 + ($i + 1);
 
 									break;
@@ -1144,12 +1144,12 @@ 
 
 									$dayofweek = gmdate("w", $occenddate);
 									for ($i = 0; $i < 7; ++$i) {
-										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 											$occenddate -= $i * 24 * 60 * 60;
 
 											break;
 										}
-										if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+										if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
 
 											break;
@@ -1918,7 +1918,7 @@ 
 						}
 						elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 
 							if ($now <= $dayend) {

lib/grommunio/grommunio.php

Spacing +5 added lines, -6 removed lines

@@ -1374,8 +1374,7 @@ 
 
 		// if the search range is set limit the result to it, otherwise return all found messages
 		$rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
-			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-			mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
+			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) : mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
 
 		$cnt = count($rows);
 		$items['searchtotal'] = $cnt;
@@ -1976,12 +1975,12 @@ 
 			mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
 		}
 		if (isset($stateMessage)) {
-			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
+			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE|JSON_UNESCAPED_UNICODE) : $state;
 
 			$encodedState = base64_encode($jsonEncodedState);
 			$encodedStateLength = strlen($encodedState);
 			mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
-			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, $encodedStateLength);
 			mapi_stream_write($stream, $encodedState);
 			mapi_stream_commit($stream);
@@ -2076,7 +2075,7 @@ 
 	private function adviseStoreToSink($store) {
 		// check if we already advised the store
 		if (!in_array($store, $this->changesSinkStores)) {
-			mapi_msgstore_advise($store, null, fnevNewMail |fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
+			mapi_msgstore_advise($store, null, fnevNewMail|fnevObjectModified|fnevObjectCreated|fnevObjectMoved|fnevObjectDeleted, $this->changesSink);
 
 			if (mapi_last_hresult()) {
 				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
@@ -2550,7 +2549,7 @@ 
 					$resOr,
 					[RES_CONTENT,
 						[
-							FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+							FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 							ULPROPTAG => $property,
 							VALUE => u2w($term),
 						],