grommunio / grommunio-sync

mapi/mapi.util.php

Spacing +3 added lines, -3 removed lines

@@ -206,7 +206,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,
@@ -235,8 +235,8 @@ 
 						VALUE => true,
 					],
 				],
-			],	// EXISTS OR
-		];		// global OR
+			], // EXISTS 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 +15 added lines, -15 removed lines

@@ -153,15 +153,15 @@ 
 		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:' . PidLidReminderDelta;
 		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:' . PidLidReminderSet;
 		$properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:' . PidLidAppointmentSequence;					// AppointmentSequenceNumber
+		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:' . PidLidAppointmentSequence; // AppointmentSequenceNumber
 		$properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
-		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';			// AppointmentLastSequence
+		$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['flagdueby'] = 'PT_SYSTIME:PSETID_Common:' . PidLidReminderSignalTime;
@@ -170,11 +170,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
 		$properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
 		// Propose new time properties
 		$properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidAppointmentProposedStartWhole;
@@ -549,7 +549,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;
 		}
@@ -1481,7 +1481,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;
 		}
 
@@ -2486,7 +2486,7 @@ 
 		$getResourcesRestriction = [
 			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],
 			],
@@ -2762,7 +2762,7 @@ 
 		$getResourcesRestriction = [
 			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],
 			],
@@ -2980,7 +2980,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],
 					],
@@ -3083,7 +3083,7 @@ 
 			$stripResourcesRestriction[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],
 				],
@@ -3189,7 +3189,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] = dgettext('zarafa', 'Canceled') . ': ' . $newmessageprops[PR_SUBJECT];
 			}

mapi/class.baserecurrence.php

Spacing +1 added lines, -1 removed lines

@@ -1898,7 +1898,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) {

mapi/class.taskrequest.php

Spacing +20 added lines, -20 removed lines

@@ -24,12 +24,12 @@ 
  * carried in the IPM.TaskRequest item (although this information seems
  * redundant due to that information already being available in PR_MESSAGE_CLASS).
  */
-define('tdmtNothing', 0);			// Value in IPM.Task items
-define('tdmtTaskReq', 1);			// Assigner -> Assignee
-define('tdmtTaskAcc', 2);			// Assignee -> Assigner
-define('tdmtTaskDec', 3);			// Assignee -> Assigner
-define('tdmtTaskUpd', 4);			// Assignee -> Assigner
-define('tdmtTaskSELF', 5);			// Assigner -> Assigner (?)
+define('tdmtNothing', 0); // Value in IPM.Task items
+define('tdmtTaskReq', 1); // Assigner -> Assignee
+define('tdmtTaskAcc', 2); // Assignee -> Assigner
+define('tdmtTaskDec', 3); // Assignee -> Assigner
+define('tdmtTaskUpd', 4); // Assignee -> Assigner
+define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
 /* The TaskHistory is used to show the last action on the task
  * on both the assigner and the assignee's side.
@@ -39,22 +39,22 @@ 
  * the format 'Accepted by <user> on 01-01-2010 11:00'.
  */
 define('thNone', 0);
-define('thAccepted', 1);			// Set by assignee
-define('thDeclined', 2);			// Set by assignee
-define('thUpdated', 3);				// Set by assignee
+define('thAccepted', 1); // Set by assignee
+define('thDeclined', 2); // Set by assignee
+define('thUpdated', 3); // Set by assignee
 define('thDueDateChanged', 4);
-define('thAssigned', 5);			// Set by assigner
+define('thAssigned', 5); // Set by assigner
 
 /* The TaskState value is used to differentiate the version of a task
  * in the assigner's folder and the version in the
  * assignee's folder. The buttons shown depend on this and
  * the 'taskaccepted' boolean (for the assignee)
  */
-define('tdsNOM', 0);		// Got a response to a deleted task, and re-created the task for the assigner
-define('tdsOWNNEW', 1);		// Not assigned
-define('tdsOWN', 2);		// Assignee version
-define('tdsACC', 3);		// Assigner version
-define('tdsDEC', 4);		// Assigner version, but assignee declined
+define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+define('tdsOWNNEW', 1); // Not assigned
+define('tdsOWN', 2); // Assignee version
+define('tdsACC', 3); // Assigner version
+define('tdsDEC', 4); // Assigner version, but assignee declined
 
 /* The TaskAcceptanceState is used for the assigner to indicate state */
 define('olTaskNotDelegated', 0);
@@ -64,13 +64,13 @@ 
 
 /* The task ownership indicates the role of the current user relative to the task. */
 define('olNewTask', 0);
-define('olDelegatedTask', 1);	// Task has been assigned
-define('olOwnTask', 2);			// Task owned
+define('olDelegatedTask', 1); // Task has been assigned
+define('olOwnTask', 2); // Task owned
 
 /* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
 define('tmrNone', 0);
-define('tmrSent', 1);		// Task has been sent to multiple assignee
-define('tmrReceived', 2);	// Task Request received has multiple assignee
+define('tmrSent', 1); // Task has been sent to multiple assignee
+define('tmrReceived', 2); // Task Request received has multiple assignee
 
 // Task icon index.
 define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -1243,7 +1243,7 @@ 
 			}
 
 			foreach ($recips as $recip) {
-				$recip[PR_RECIPIENT_TYPE] = MAPI_TO;	// Change recipient type to MAPI_TO
+				$recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
 				mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
 			}
 

mapi/class.recurrence.php

Spacing +2 added lines, -2 removed lines

@@ -1071,7 +1071,7 @@ 
 				else {
 					$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']);
@@ -1146,7 +1146,7 @@ 
 						else {
 							$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;
 					}
 				}

lib/grommunio/grommunio.php

Spacing +5 added lines, -6 removed lines

@@ -1370,8 +1370,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;
@@ -1591,15 +1590,15 @@ 
 		$store = $this->openMessageStore("SYSTEM");
 		$pubStore = mapi_msgstore_openentry($store, null);
 		$hierarchyTable = mapi_folder_gethierarchytable($pubStore, CONVENIENT_DEPTH);
-		$restriction = [ RES_PROPERTY,
+		$restriction = [RES_PROPERTY,
 			[
 				RELOP => RELOP_EQ,
 				ULPROPTAG => PR_SYNC_TO_MOBILE,
-				VALUE => [ PR_SYNC_TO_MOBILE => True],
+				VALUE => [PR_SYNC_TO_MOBILE => True],
 			]
 		];
 		mapi_table_restrict($hierarchyTable, $restriction, TBL_BATCH);
-		$rows = mapi_table_queryallrows($hierarchyTable, [ PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY ]);
+		$rows = mapi_table_queryallrows($hierarchyTable, [PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY]);
 		$f = [];
 		foreach ($rows as $row) {
 			$folderid = bin2hex($row[PR_SOURCE_KEY]);
@@ -2059,7 +2058,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()));