grommunio / grommunio-sync

version.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	$branch = trim(exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \\(.*\\)/\\1/\""));
 	$version = exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git describe  --always 2>/dev/null");
 	if ($branch && $version) {
-		define("GROMMUNIOSYNC_VERSION", $branch . '-' . $version);
+		define("GROMMUNIOSYNC_VERSION", $branch.'-'.$version);
 	}
 	else {
 		define("GROMMUNIOSYNC_VERSION", "GIT");

mapi/class.meetingrequest.php

Spacing +29 added lines, -29 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;
 		}
@@ -1436,7 +1436,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;
 		}
 
@@ -2074,9 +2074,9 @@ 
 			$subjectprefix = _('New Time Proposed');
 		}
 
-		$props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
+		$props[PR_SUBJECT] = $subjectprefix.': '.$messageprops[PR_SUBJECT];
 
-		$props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.' . $classpostfix;
+		$props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.'.$classpostfix;
 		if (isset($messageprops[PR_OWNER_APPT_ID])) {
 			$props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
 		}
@@ -2285,12 +2285,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;
 			}
 		}
 
@@ -2304,7 +2304,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.
@@ -2362,7 +2362,7 @@ 
 		$month = $basedate ? sprintf('%02s', dechex(gmdate('m', $basedate))) : '00';
 		$day = $basedate ? sprintf('%02s', dechex(gmdate('d', $basedate))) : '00';
 
-		return hex2bin(strtoupper(substr($hexguid, 0, 32) . $year . $month . $day . substr($hexguid, 40)));
+		return hex2bin(strtoupper(substr($hexguid, 0, 32).$year.$month.$day.substr($hexguid, 40)));
 	}
 
 	/**
@@ -2400,7 +2400,7 @@ 
 					continue;
 				}
 
-				$attachOld = mapi_message_openattach($copyFrom, (int) $attachProps[PR_ATTACH_NUM]);
+				$attachOld = mapi_message_openattach($copyFrom, (int)$attachProps[PR_ATTACH_NUM]);
 				$attachNewResourceMsg = mapi_message_createattach($copyTo);
 				mapi_copyto($attachOld, [], [], $attachNewResourceMsg, 0);
 				mapi_savechanges($attachNewResourceMsg);
@@ -2491,7 +2491,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],
 					],
@@ -2623,7 +2623,7 @@ 
 
 				// Prefix the subject if needed
 				if ($prefix && isset($messageprops[PR_SUBJECT])) {
-					$messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
+					$messageprops[PR_SUBJECT] = $prefix.$messageprops[PR_SUBJECT];
 				}
 
 				// Set status to cancelled if needed
@@ -2773,7 +2773,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],
 					],
@@ -3005,7 +3005,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],
 					],
@@ -3061,7 +3061,7 @@ 
 
 		// Prefix the subject if needed
 		if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
-			$newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+			$newmessageprops[PR_SUBJECT] = $prefix.$newmessageprops[PR_SUBJECT];
 		}
 
 		if (isset($newmessageprops[$this->proptags['categories']]) &&
@@ -3102,7 +3102,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],
 										],
@@ -3209,9 +3209,9 @@ 
 			$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];
+				$newmessageprops[PR_SUBJECT] = _('Canceled: ').$newmessageprops[PR_SUBJECT];
 			}
 
 			mapi_setprops($new, $newmessageprops);
@@ -3269,12 +3269,12 @@ 
 
 			// [0] => year, [1] => month, [2] => day, [3] => hour, [4] => minutes, [5] => seconds
 			// RecurStartDate = year * 512 + month_number * 32 + day_number
-			$newmessageprops[$this->proptags['start_recur_date']] = (((int) $startDate[0]) * 512) + (((int) $startDate[1]) * 32) + ((int) $startDate[2]);
+			$newmessageprops[$this->proptags['start_recur_date']] = (((int)$startDate[0]) * 512) + (((int)$startDate[1]) * 32) + ((int)$startDate[2]);
 			// RecurStartTime = hour * 4096 + minutes * 64 + seconds
-			$newmessageprops[$this->proptags['start_recur_time']] = (((int) $startDate[3]) * 4096) + (((int) $startDate[4]) * 64) + ((int) $startDate[5]);
+			$newmessageprops[$this->proptags['start_recur_time']] = (((int)$startDate[3]) * 4096) + (((int)$startDate[4]) * 64) + ((int)$startDate[5]);
 
-			$newmessageprops[$this->proptags['end_recur_date']] = (((int) $endDate[0]) * 512) + (((int) $endDate[1]) * 32) + ((int) $endDate[2]);
-			$newmessageprops[$this->proptags['end_recur_time']] = (((int) $endDate[3]) * 4096) + (((int) $endDate[4]) * 64) + ((int) $endDate[5]);
+			$newmessageprops[$this->proptags['end_recur_date']] = (((int)$endDate[0]) * 512) + (((int)$endDate[1]) * 32) + ((int)$endDate[2]);
+			$newmessageprops[$this->proptags['end_recur_time']] = (((int)$endDate[3]) * 4096) + (((int)$endDate[4]) * 64) + ((int)$endDate[5]);
 		}
 	}
 

mapi/class.taskrecurrence.php

Spacing +2 added lines, -2 removed lines

@@ -284,7 +284,7 @@ 
 				$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
 
 				foreach ($attachments as $attach_props) {
-					$attach_old = mapi_message_openattach($this->message, (int) $attach_props[PR_ATTACH_NUM]);
+					$attach_old = mapi_message_openattach($this->message, (int)$attach_props[PR_ATTACH_NUM]);
 					$attach_newResourceMsg = mapi_message_createattach($newMessage);
 
 					mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
@@ -301,7 +301,7 @@ 
 			$separator = "------------\r\n";
 
 			if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
-				$msgbody = $separator . $msgbody;
+				$msgbody = $separator.$msgbody;
 				$stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, STGM_TRANSACTED, 0);
 				mapi_stream_setsize($stream, strlen($msgbody));
 				mapi_stream_write($stream, $msgbody);

mapi/mapicode.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
  * @param mixed $code
  */
 function make_mapi_e($code) {
-	return (int) mapi_make_scode(1, $code);
+	return (int)mapi_make_scode(1, $code);
 }
 
 /**
@@ -36,7 +36,7 @@ 
  * @param mixed $code
  */
 function make_mapi_s($code) {
-	return (int) mapi_make_scode(0, $code);
+	return (int)mapi_make_scode(0, $code);
 }
 
 /* From mapicode.h */

mapi/class.recurrence.php

Spacing +15 added lines, -15 removed lines

@@ -598,8 +598,8 @@ 
 			}
 
 			// get timings of the first occurrence
-			$firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
-			$firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
+			$firstoccstartdate = isset($startocc) ? $start + (((int)$startocc) * 60) : $start;
+			$firstoccenddate = isset($endocc) ? $end + (((int)$endocc) * 60) : $end;
 
 			$start = gmdate(_('d-m-Y'), $firstoccstartdate);
 			$end = gmdate(_('d-m-Y'), $firstoccenddate);
@@ -743,7 +743,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);
@@ -751,7 +751,7 @@ 
 					$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
 
 					foreach ($attachments as $attach_props) {
-						$attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
+						$attach_old = mapi_message_openattach($copy_attach_from, (int)$attach_props[PR_ATTACH_NUM]);
 						$attach_newResourceMsg = mapi_message_createattach($imessage);
 						mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
 						mapi_savechanges($attach_newResourceMsg);
@@ -1123,13 +1123,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']);
@@ -1199,13 +1199,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;
 						}
 					}
@@ -1265,12 +1265,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;
 				}
 			}
 
@@ -1284,7 +1284,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/class.freebusypublish.php

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 					],
 				], // EXISTS OR
 			],
-		];        // global OR
+		]; // global OR
 
 		$contents = mapi_folder_getcontentstable($this->calendar);
 		mapi_table_restrict($contents, $restrict);

mapi/class.baserecurrence.php

Spacing +78 added lines, -78 removed lines

@@ -573,14 +573,14 @@ 
 				return;
 			}
 
-			$rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int) $this->recur["type"], 0x20, (int) $this->recur["subtype"]);
+			$rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int)$this->recur["type"], 0x20, (int)$this->recur["subtype"]);
 
 			$weekstart = 1; // monday
 			$forwardcount = 0;
 			$restocc = 0;
-			$dayofweek = (int) gmdate("w", (int) $this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
+			$dayofweek = (int)gmdate("w", (int)$this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
 
-			$term = (int) $this->recur["type"];
+			$term = (int)$this->recur["type"];
 
 			switch ($term) {
 				case 0x0A:
@@ -596,12 +596,12 @@ 
 					else {
 						// Daily every N days (everyN in minutes)
 
-						$everyn = ((int) $this->recur["everyn"]) / 1440;
+						$everyn = ((int)$this->recur["everyn"]) / 1440;
 
 						// Calc first occ
-						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int)$this->recur["everyn"]);
 
-						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
+						$rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
 					}
 
 					break;
@@ -624,7 +624,7 @@ 
 						$daycount = 0;
 						$dayskip = -1;
 						for ($j = 0; $j < 7; ++$j) {
-							if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+							if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
 								if ($dayskip == -1) {
 									$dayskip = $j;
 								}
@@ -643,35 +643,35 @@ 
 
 						// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
 						// remaining occurrences based on the start of the recurrence.
-						if (((int) $this->recur["term"]) == 0x22) {
+						if (((int)$this->recur["term"]) == 0x22) {
 							// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
 							// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
 							// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
 							// (eg when numoccur = 2, and daycount = 1)
-							$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
+							$forwardcount = floor((int)($this->recur["numoccur"] - 1) / $daycount);
 
 							// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
 							// for the occurrence on the first day
-							$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
+							$restocc = ((int)$this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
 
 							// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-							$forwardcount *= (int) $this->recur["everyn"];
+							$forwardcount *= (int)$this->recur["everyn"];
 						}
 
 						// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-						$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
+						$this->recur["start"] = ((int)$this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
 					}
 
 					// Calc first occ
-					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
+					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int)$this->recur["everyn"]) * 7 * 24 * 60);
 
-					$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
+					$firstocc -= (((int)gmdate("w", (int)$this->recur["start"])) - 1) * 24 * 60;
 
 					if ($this->recur["regen"]) {
-						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
+						$rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], 1);
 					}
 					else {
-						$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+						$rdata .= pack("VVVV", $firstocc, (int)$this->recur["everyn"], 0, (int)$this->recur["weekdays"]);
 					}
 
 					break;
@@ -688,31 +688,31 @@ 
 					}
 
 					if ($term == 0x0C /* monthly */) {
-						$everyn = (int) $this->recur["everyn"];
+						$everyn = (int)$this->recur["everyn"];
 					}
 					else {
-						$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+						$everyn = $this->recur["regen"] ? ((int)$this->recur["everyn"]) * 12 : 12;
 					}
 
 					// Get montday/month/year of original start
-					$curmonthday = gmdate("j", (int) $this->recur["start"]);
-					$curyear = gmdate("Y", (int) $this->recur["start"]);
-					$curmonth = gmdate("n", (int) $this->recur["start"]);
+					$curmonthday = gmdate("j", (int)$this->recur["start"]);
+					$curyear = gmdate("Y", (int)$this->recur["start"]);
+					$curmonth = gmdate("n", (int)$this->recur["start"]);
 
 					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
 					// remaining occurrences based on the start of the recurrence.
-					if (((int) $this->recur["term"]) == 0x22) {
+					if (((int)$this->recur["term"]) == 0x22) {
 						// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
 						// one to make sure there are always at least one occurrence left)
-						$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
+						$forwardcount = ((((int)$this->recur["numoccur"]) - 1) * $everyn);
 					}
 
 					// Get month for yearly on D'th day of month M
 					if ($term == 0x0D /* yearly */) {
-						$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
+						$selmonth = floor(((int)$this->recur["month"]) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
 					}
 
-					switch ((int) $this->recur["subtype"]) {
+					switch ((int)$this->recur["subtype"]) {
 						// on D day of every M month
 						case 2:
 							if (!isset($this->recur["monthday"])) {
@@ -725,11 +725,11 @@ 
 							// Go the beginning of the month
 							$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
 							// Go the the correct month day
-							$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
+							$this->recur["start"] += (((int)$this->recur["monthday"]) - 1) * 24 * 60 * 60;
 
 							// If the previous calculation gave us a start date different than the original start date, then we need to skip to the first occurrence
-							if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-								($term == 0x0D /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
+							if (($term == 0x0C /* monthly */ && ((int)$this->recur["monthday"]) < $curmonthday) ||
+								($term == 0x0D /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int)$this->recur["monthday"]) < $curmonthday)))) {
 								if ($term == 0x0D /* yearly */) {
 									if ($curmonth > $selmonth) {// go to next occurrence in 'everyn' months minus difference in first occurrence and original date
 										$count = $everyn - ($curmonth - $selmonth);
@@ -739,7 +739,7 @@ 
 									}
 									else {
 										// Go to next occurrence while recurrence start date is greater than occurrence date but within same month
-										if (((int) $this->recur["monthday"]) < $curmonthday) {
+										if (((int)$this->recur["monthday"]) < $curmonthday) {
 											$count = $everyn;
 										}
 									}
@@ -765,33 +765,33 @@ 
 							// of each month will overshoot in february (29 days). We compensate for that by checking
 							// if the day of the month we got is wrong, and then back up to the last day of the previous
 							// month.
-							if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-								gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
-								$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
+							if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+								gmdate("j", ((int)$this->recur["start"])) < ((int)$this->recur["monthday"])) {
+								$this->recur["start"] -= gmdate("j", ((int)$this->recur["start"])) * 24 * 60 * 60;
 							}
 
 							// "start" is now the first occurrence
 
 							if ($term == 0x0C /* monthly */) {
 								// Calc first occ
-								$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								$monthIndex = ((((12 % $everyn) * ((((int)gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
 								$firstocc = 0;
 								for ($i = 0; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
 								}
 
-								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
 							}
 							else {
 								// Calc first occ
 								$firstocc = 0;
-								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								$monthIndex = (int)gmdate("n", $this->recur["start"]);
 								for ($i = 1; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
 								}
 
-								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
 							}
 
 							break;
@@ -803,11 +803,11 @@ 
 								return;
 							}
 
-							$weekdays = (int) $this->recur["weekdays"];
-							$nday = (int) $this->recur["nday"];
+							$weekdays = (int)$this->recur["weekdays"];
+							$nday = (int)$this->recur["nday"];
 
 							// Calc startdate
-							$monthbegindow = (int) $this->recur["start"];
+							$monthbegindow = (int)$this->recur["start"];
 
 							if ($nday == 5) {
 								// Set date on the last day of the last month
@@ -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;
@@ -855,7 +855,7 @@ 
 								}
 
 								// Goto the next X month
-								if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+								if (isset($day) && ($day < gmdate("j", (int)$this->recur["start"]))) {
 									if ($nday == 5) {
 										$monthbegindow += 24 * 60 * 60;
 										if ($curmonth == 12) {
@@ -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;
@@ -909,7 +909,7 @@ 
 
 							if ($term == 0x0C /* monthly */) {
 								// Calc first occ
-								$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								$monthIndex = ((((12 % $everyn) * (((int)gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
 								for ($i = 0; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
@@ -919,7 +919,7 @@ 
 							}
 							else {
 								// Calc first occ
-								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								$monthIndex = (int)gmdate("n", $this->recur["start"]);
 
 								for ($i = 1; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
@@ -939,7 +939,7 @@ 
 			}
 
 			// Terminate
-			$term = (int) $this->recur["term"];
+			$term = (int)$this->recur["term"];
 			$rdata .= pack("CCCC", $term, 0x20, 0x00, 0x00);
 
 			switch ($term) {
@@ -954,7 +954,7 @@ 
 						return;
 					}
 
-					$rdata .= pack("V", (int) $this->recur["numoccur"]);
+					$rdata .= pack("V", (int)$this->recur["numoccur"]);
 
 					break;
 				// Never ends
@@ -965,7 +965,7 @@ 
 			}
 
 			// Strange little thing for the recurrence type "every workday"
-			if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
+			if (((int)$this->recur["type"]) == 0x0B && ((int)$this->recur["subtype"]) == 1) {
 				$rdata .= pack("V", 1);
 			}
 			else { // Other recurrences
@@ -1009,25 +1009,25 @@ 
 			}
 
 			// Set start date
-			$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
+			$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["start"]));
 
 			// Set enddate
 			switch ($term) {
 				// After the given enddate
 				case 0x21:
-					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+					$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
 
 					break;
 				// After a number of times
 				case 0x22:
 					// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-					$occenddate = (int) $this->recur["start"];
+					$occenddate = (int)$this->recur["start"];
 
-					switch ((int) $this->recur["type"]) {
+					switch ((int)$this->recur["type"]) {
 						case 0x0A: // daily
 							if ($this->recur["subtype"] == 1) {
 								// Daily every workday
-								$restocc = (int) $this->recur["numoccur"];
+								$restocc = (int)$this->recur["numoccur"];
 
 								// Get starting weekday
 								$nowtime = $this->gmtime($occenddate);
@@ -1049,7 +1049,7 @@ 
 							}
 							else {
 								// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-								$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
+								$occenddate += (((int)$this->recur["everyn"]) * 60 * (((int)$this->recur["numoccur"] - 1)));
 							}
 
 							break;
@@ -1068,11 +1068,11 @@ 
 							for ($j = 1; $restocc > 0; ++$j) {
 								// Jump to the next week (which may be N weeks away) when going over the week boundary
 								if ((($dayofweek + $j) % 7) == $weekstart) {
-									$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
+									$occenddate += (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
 								}
 
 								// If this is a matching day, once less occurrence to process
-								if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+								if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
 									--$restocc;
 								}
 
@@ -1084,11 +1084,11 @@ 
 
 						case 0x0C: // monthly
 						case 0x0D: // yearly
-							$curyear = gmdate("Y", (int) $this->recur["start"]);
-							$curmonth = gmdate("n", (int) $this->recur["start"]);
+							$curyear = gmdate("Y", (int)$this->recur["start"]);
+							$curmonth = gmdate("n", (int)$this->recur["start"]);
 							// $forwardcount = months
 
-							switch ((int) $this->recur["subtype"]) {
+							switch ((int)$this->recur["subtype"]) {
 								case 2: // on D day of every M month
 									while ($forwardcount > 0) {
 										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -1104,8 +1104,8 @@ 
 									}
 
 									// compensation between 28 and 31
-									if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-										gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
+									if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+										gmdate("j", $occenddate) < ((int)$this->recur["monthday"])) {
 										if (gmdate("j", $occenddate) < 28) {
 											$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
 										}
@@ -1117,8 +1117,8 @@ 
 									break;
 
 								case 3: // on Nth weekday of every M month
-									$nday = (int) $this->recur["nday"]; // 1 tot 5
-									$weekdays = (int) $this->recur["weekdays"];
+									$nday = (int)$this->recur["nday"]; // 1 tot 5
+									$weekdays = (int)$this->recur["weekdays"];
 
 									while ($forwardcount > 0) {
 										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -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;
@@ -1168,7 +1168,7 @@ 
 
 					$this->recur["end"] = $occenddate;
 
-					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+					$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
 
 					break;
 				// Never ends
@@ -1181,12 +1181,12 @@ 
 			}
 
 			// UTC date
-			$utcstart = $this->toGMT($this->tz, (int) $this->recur["start"]);
-			$utcend = $this->toGMT($this->tz, (int) $this->recur["end"]);
+			$utcstart = $this->toGMT($this->tz, (int)$this->recur["start"]);
+			$utcend = $this->toGMT($this->tz, (int)$this->recur["end"]);
 
 			// utc date+time
-			$utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int) $this->recur["startocc"]) * 60) : $utcstart;
-			$utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int) $this->recur["endocc"]) * 60) : $utcstart;
+			$utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int)$this->recur["startocc"]) * 60) : $utcstart;
+			$utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int)$this->recur["endocc"]) * 60) : $utcstart;
 
 			$propsToSet = [];
 			// update reminder time
@@ -1204,7 +1204,7 @@ 
 
 				// recurrencetype
 				// Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
-				$propsToSet[$this->proptags["recurrencetype"]] = ((int) $this->recur["type"]) - 0x9;
+				$propsToSet[$this->proptags["recurrencetype"]] = ((int)$this->recur["type"]) - 0x9;
 
 				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
 				$propsToSet[$this->proptags["side_effects"]] = 369;
@@ -1253,7 +1253,7 @@ 
 
 			if (isset($this->recur["startocc"], $this->recur["endocc"])) {
 				// Set start and endtime in minutes
-				$rdata .= pack("VV", (int) $this->recur["startocc"], (int) $this->recur["endocc"]);
+				$rdata .= pack("VV", (int)$this->recur["startocc"], (int)$this->recur["endocc"]);
 			}
 
 			// Detailed exception data
@@ -1308,7 +1308,7 @@ 
 					$subject = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["subject"]);
 					$length = strlen($subject);
 					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $subject);
+					$rdata .= pack("a".$length, $subject);
 				}
 
 				if (isset($changed_item["remind_before"])) {
@@ -1323,7 +1323,7 @@ 
 					$location = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["location"]);
 					$length = strlen($location);
 					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $location);
+					$rdata .= pack("a".$length, $location);
 				}
 
 				if (isset($changed_item["busystatus"])) {
@@ -1354,14 +1354,14 @@ 
 					$subject = iconv("UTF-8", "UCS-2LE", $changed_item["subject"]);
 					$length = iconv_strlen($subject, "UCS-2LE");
 					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $subject);
+					$rdata .= pack("a".$length * 2, $subject);
 				}
 
 				if (isset($changed_item["location"])) {
 					$location = iconv("UTF-8", "UCS-2LE", $changed_item["location"]);
 					$length = iconv_strlen($location, "UCS-2LE");
 					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $location);
+					$rdata .= pack("a".$length * 2, $location);
 				}
 
 				if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
@@ -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) {

mapi/class.baseexception.php

Spacing +2 added lines, -2 removed lines

@@ -54,14 +54,14 @@
 		// assign display message
 		$this->displayMessage = $displayMessage;
 
-		parent::__construct($errorMessage, (int) $code, $previous);
+		parent::__construct($errorMessage, (int)$code, $previous);
 	}
 
 	/**
 	 * @return string returns file name and line number combined where exception occurred
 	 */
 	public function getFileLine() {
-		return $this->getBaseFile() . ':' . $this->getLine();
+		return $this->getBaseFile().':'.$this->getLine();
 	}
 
 	/**

mapi/mapi.util.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  * @param mixed $guid
  */
 function makeGuid($guid) {
-	return pack("vvvv", hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))) . hex2bin(substr($guid, 20, 4)) . hex2bin(substr($guid, 25, 12));
+	return pack("vvvv", hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))).hex2bin(substr($guid, 20, 4)).hex2bin(substr($guid, 25, 12));
 }
 
 /**
@@ -48,7 +48,7 @@ 
 			 * we have to manually typecast value to integer, so float will be converted in integer,
 			 * but still its out of bound for integer limit so it will be auto adjusted to minus value
 			 */
-			if ($errcode == (int) $value) {
+			if ($errcode == (int)$value) {
 				// Check that we have an actual MAPI error or warning definition
 				$prefix = substr($key, 0, 7);
 				if ($prefix == "MAPI_E_" || $prefix == "MAPI_W_") {
@@ -64,7 +64,7 @@ 
 	// error code not found, return hex value (this is a fix for 64-bit systems, we can't use the dechex() function for this)
 	$result = unpack("H*", pack("N", $errcode));
 
-	return "0x" . $result[1];
+	return "0x".$result[1];
 }
 
 /**
@@ -167,7 +167,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_REMOTE_VALID($value) {
-	return (bool) ($value & DTE_FLAG_REMOTE_VALID);
+	return (bool)($value & DTE_FLAG_REMOTE_VALID);
 }
 
 /**
@@ -176,7 +176,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_ACL_CAPABLE($value) {
-	return (bool) ($value & DTE_FLAG_ACL_CAPABLE);
+	return (bool)($value & DTE_FLAG_ACL_CAPABLE);
 }
 
 function DTE_REMOTE($value) {
@@ -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"]];