grommunio / grommunio-web

server/includes/core/class.conversion.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 						break;
 
 					case PT_MV_STRING8:
-					case PT_MV_STRING8 | MVI_FLAG:
+					case PT_MV_STRING8|MVI_FLAG:
 						$mv_values = explode(";", $value);
 						$values = [];
 

server/includes/core/class.operations.php

Spacing +17 added lines, -17 removed lines

@@ -448,7 +448,7 @@ 
 				],
 			]];
 
-			$hierarchyTable = mapi_folder_gethierarchytable($folder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+			$hierarchyTable = mapi_folder_gethierarchytable($folder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 			mapi_table_restrict($hierarchyTable, $restriction, TBL_BATCH);
 
 			// Also request PR_DEPTH
@@ -1327,7 +1327,7 @@ 
 				if ($hardDelete === true) {
 					// hard delete the message if requested
 					// beware that folder can not be recovered after this and will be deleted from system entirely
-					if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES | DEL_FOLDERS | DELETE_HARD_DELETE)) {
+					if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES|DEL_FOLDERS|DELETE_HARD_DELETE)) {
 						$result = true;
 
 						// if exists, also delete settings made for this folder (client don't need an update for this)
@@ -1339,7 +1339,7 @@ 
 						// TODO: check if not only $parententryid=wastebasket, but also the parents of that parent...
 						// if folder is already in wastebasket or softDelete is requested then delete the message
 						if ($msgprops[PR_IPM_WASTEBASKET_ENTRYID] == $parententryid || $softDelete === true) {
-							if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES | DEL_FOLDERS)) {
+							if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES|DEL_FOLDERS)) {
 								$result = true;
 
 								// if exists, also delete settings made for this folder (client don't need an update for this)
@@ -1380,7 +1380,7 @@ 
 						}
 					}
 					else {
-						if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES | DEL_FOLDERS)) {
+						if (mapi_folder_deletefolder($folder, $entryid, DEL_MESSAGES|DEL_FOLDERS)) {
 							$result = true;
 
 							// if exists, also delete settings made for this folder (client don't need an update for this)
@@ -2113,7 +2113,7 @@ 
 
 				if ($property != false) {
 					// Stream the body to the PR_BODY or PR_HTML property
-					$stream = mapi_openproperty($message, $property, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+					$stream = mapi_openproperty($message, $property, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 					mapi_stream_setsize($stream, strlen($body));
 					mapi_stream_write($stream, $body);
 					mapi_stream_commit($stream);
@@ -2192,9 +2192,9 @@ 
 			$messageProps = [];
 			// It stores the values that is exception allowed or not false -> not allowed
 			$isExceptionAllowed = true;
-			$delete = $actionType == 'delete';	// Flag for MeetingRequest Class whether to send update or cancel mail.
-			$basedate = false;	// Flag for MeetingRequest Class whether to send an exception or not.
-			$isReminderTimeAllowed = true;	// Flag to check reminder minutes is in range of the occurrences
+			$delete = $actionType == 'delete'; // Flag for MeetingRequest Class whether to send update or cancel mail.
+			$basedate = false; // Flag for MeetingRequest Class whether to send an exception or not.
+			$isReminderTimeAllowed = true; // Flag to check reminder minutes is in range of the occurrences
 			$properties = $GLOBALS['properties']->getAppointmentProperties();
 			$send = false;
 			$oldProps = [];
@@ -3115,7 +3115,7 @@ 
 				 * convert flags of PR_MESSAGE_FLAGS property to flags that is
 				 * used in mapi_message_setreadflag.
 				 */
-				$flag = MAPI_DEFERRED_ERRORS;		// set unread flag, read receipt will be sent
+				$flag = MAPI_DEFERRED_ERRORS; // set unread flag, read receipt will be sent
 
 				if (($flags & MSGFLAG_RN_PENDING) && isset($msg_action['send_read_receipt']) && $msg_action['send_read_receipt'] == false) {
 					$flag |= SUPPRESS_RECEIPT;
@@ -3327,7 +3327,7 @@ 
 						$attachment = mapi_message_createattach($message);
 						mapi_setprops($attachment, $props);
 
-						$imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
+						$imessage = mapi_attach_openobj($attachment, MAPI_CREATE|MAPI_MODIFY);
 
 						// Copy the properties from the source message to the attachment
 						mapi_copyto($copyFrom, [], [], $imessage, 0); // includes attachments and recipients
@@ -3367,7 +3367,7 @@ 
 						mapi_setprops($attachment, $props);
 
 						// Stream the file to the PR_ATTACH_DATA_BIN property
-						$stream = mapi_openproperty($attachment, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+						$stream = mapi_openproperty($attachment, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 						mapi_stream_write($stream, $appointmentStream);
 
 						// Commit the stream and save changes
@@ -3419,7 +3419,7 @@ 
 							mapi_setprops($attachment, $props);
 
 							// Stream the file to the PR_ATTACH_DATA_BIN property
-							$stream = mapi_openproperty($attachment, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+							$stream = mapi_openproperty($attachment, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 							$handle = fopen($filepath, "r");
 							while (!feof($handle)) {
 								$contents = fread($handle, BLOCK_SIZE);
@@ -3561,7 +3561,7 @@ 
 								PR_ATTACH_EXTENSION => $props[PR_ATTACH_EXTENSION] ?? '',
 								PR_ATTACH_FLAGS => $props[PR_ATTACH_FLAGS] ?? 0,
 							]);
-							$newstream = mapi_openproperty($new, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+							$newstream = mapi_openproperty($new, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 							mapi_stream_setsize($newstream, $stat['cb']);
 							for ($i = 0; $i < $stat['cb']; $i += BLOCK_SIZE) {
 								mapi_stream_write($newstream, mapi_stream_read($oldstream, BLOCK_SIZE));
@@ -3862,11 +3862,11 @@ 
 			foreach ($recipientList as $recipientItem) {
 				if ($isException) {
 					// We do not add organizer to exception msg in organizer's calendar.
-					if (isset($recipientItem[PR_RECIPIENT_FLAGS]) && $recipientItem[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
+					if (isset($recipientItem[PR_RECIPIENT_FLAGS]) && $recipientItem[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
 						continue;
 					}
 
-					$recipient[PR_RECIPIENT_FLAGS] = (recipSendable | recipExceptionalResponse | recipReserved);
+					$recipient[PR_RECIPIENT_FLAGS] = (recipSendable|recipExceptionalResponse|recipReserved);
 				}
 
 				if (!empty($recipientItem["smtp_address"]) && empty($recipientItem["email_address"])) {
@@ -4466,7 +4466,7 @@ 
 
 			$l_sNewRecipientHistoryJSON = json_encode($recipient_history);
 
-			$stream = mapi_openproperty($store, PR_EC_RECIPIENT_HISTORY_JSON, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($store, PR_EC_RECIPIENT_HISTORY_JSON, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, strlen($l_sNewRecipientHistoryJSON));
 			mapi_stream_write($stream, $l_sNewRecipientHistoryJSON);
 			mapi_stream_commit($stream);
@@ -4674,7 +4674,7 @@ 
 						];
 						mapi_setprops($inlineImage, $props);
 
-						$stream = mapi_openproperty($inlineImage, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+						$stream = mapi_openproperty($inlineImage, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 						mapi_stream_setsize($stream, strlen($rawImage));
 						mapi_stream_write($stream, $rawImage);
 						mapi_stream_commit($stream);

server/includes/core/class.jsonrequest.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		public function execute($json) {
 			/* If json_encode produces an empty string, wa-js shows an absolutely
 			 * worthless "Invalid data received from the server" dialog. */
-			$jsonflags = JSON_THROW_ON_ERROR | JSON_INVALID_UTF8_SUBSTITUTE;
+			$jsonflags = JSON_THROW_ON_ERROR|JSON_INVALID_UTF8_SUBSTITUTE;
 
 			try {
 				// decode JSON data

server/includes/core/class.bus.php

Spacing +2 added lines, -2 removed lines

@@ -205,7 +205,7 @@ 
 				foreach ($this->registeredStoreNotifiers as $key => &$storeNotifier) {
 					if ($entryidCmp->compareStoreEntryIds($storeNotifier['entryid'], $storeEntryid)) {
 						foreach ($storeNotifier as $key => $notifier) {
-							if (isset($notifier['events']) && ($notifier['events'] & $event)) {
+							if (isset($notifier['events']) && ($notifier['events']&$event)) {
 								if (!isset($updatedNotifiers[$key])) {
 									if (isset($this->notifiers[$key]) && is_object($this->notifiers[$key])) {
 										$this->notifiers[$key]->update($event, $entryID, $data);
@@ -225,7 +225,7 @@ 
 				if (($entryID === REQUEST_ENTRYID && $folderNotifier['entryid'] === REQUEST_ENTRYID) ||
 					($entryidCmp->compareEntryIds($folderNotifier['entryid'], $entryID))) {
 					foreach ($folderNotifier as $key => $notifier) {
-						if (isset($notifier['events']) && ($notifier['events'] & $event)) {
+						if (isset($notifier['events']) && ($notifier['events']&$event)) {
 							if (!isset($updatedNotifiers[$key])) {
 								if (isset($this->notifiers[$key]) && is_object($this->notifiers[$key])) {
 									$this->notifiers[$key]->update($event, $entryID, $data);

server/includes/core/class.indexsqlite.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 		$r3 = ($eid >> 32) & 0xFF;
 		$r4 = ($eid >> 24) & 0xFF;
 		$r5 = ($eid >> 16) & 0xFF;
-		$value = $r0 | ($r1 << 8) | ($r2 << 16) | ($r3 << 24) | ($r4 << 32) | ($r5 << 40);
+		$value = $r0|($r1 << 8)|($r2 << 16)|($r3 << 24)|($r4 << 32)|($r5 << 40);
 
 		return $value;
 	}

server/includes/core/class.settings.php

Spacing +2 added lines, -2 removed lines

@@ -514,7 +514,7 @@ 
 				}
 
 				try {
-					$stream = mapi_openproperty($this->store, PR_EC_WEBACCESS_SETTINGS_JSON, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+					$stream = mapi_openproperty($this->store, PR_EC_WEBACCESS_SETTINGS_JSON, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
 					mapi_stream_setsize($stream, strlen($settings));
 					mapi_stream_write($stream, $settings);
 					mapi_stream_commit($stream);
@@ -540,7 +540,7 @@ 
 
 			// Check if the settings have been changed.
 			if ($this->persistentSettingsString !== $persistentSettings) {
-				$stream = mapi_openproperty($this->store, PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($this->store, PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($persistentSettings));
 				mapi_stream_write($stream, $persistentSettings);
 				mapi_stream_commit($stream);

server/includes/core/class.colors.php

Spacing +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
 			$r = intval($m[1]);
 			$g = intval($m[2]);
 			$b = intval($m[3]);
-			if ($r < 0 || $r > 255 || $g < 0 || $g > 255 | $b < 0 || $b > 255) {
+			if ($r < 0 || $r > 255 || $g < 0 || $g > 255|$b < 0 || $b > 255) {
 				// Not a valid color
 				return null;
 			}

server/includes/core/class.todolist.php

Spacing +5 added lines, -5 removed lines

@@ -204,7 +204,7 @@ 
 								[
 									RES_CONTENT,
 									[
-										FUZZYLEVEL => FL_PREFIX | FL_IGNORECASE,
+										FUZZYLEVEL => FL_PREFIX|FL_IGNORECASE,
 										ULPROPTAG => PR_MESSAGE_CLASS,
 										VALUE => "IPM.Appointment",
 									],
@@ -217,7 +217,7 @@ 
 								[
 									RES_CONTENT,
 									[
-										FUZZYLEVEL => FL_PREFIX | FL_IGNORECASE,
+										FUZZYLEVEL => FL_PREFIX|FL_IGNORECASE,
 										ULPROPTAG => PR_MESSAGE_CLASS,
 										VALUE => "IPM.Activity",
 									],
@@ -230,7 +230,7 @@ 
 								[
 									RES_CONTENT,
 									[
-										FUZZYLEVEL => FL_PREFIX | FL_IGNORECASE,
+										FUZZYLEVEL => FL_PREFIX|FL_IGNORECASE,
 										ULPROPTAG => PR_MESSAGE_CLASS,
 										VALUE => "IPM.StickyNote",
 									],
@@ -422,7 +422,7 @@ 
 												[
 													RES_CONTENT,
 													[
-														FUZZYLEVEL => FL_PREFIX | FL_IGNORECASE,
+														FUZZYLEVEL => FL_PREFIX|FL_IGNORECASE,
 														ULPROPTAG => PR_MESSAGE_CLASS,
 														VALUE => "IPM.Task.",
 													],
@@ -430,7 +430,7 @@ 
 												[
 													RES_CONTENT,
 													[
-														FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+														FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 														ULPROPTAG => PR_MESSAGE_CLASS,
 														VALUE => "IPM.Task",
 													],

server/includes/download_attachment.php

Spacing +3 added lines, -3 removed lines

@@ -228,21 +228,21 @@
 			[
 				[RES_CONTENT,
 					[
-						FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+						FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 						ULPROPTAG => PR_ATTACH_CONTENT_ID,
 						VALUE => [PR_ATTACH_CONTENT_ID => $this->attachCid],
 					],
 				],
 				[RES_CONTENT,
 					[
-						FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+						FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 						ULPROPTAG => PR_ATTACH_CONTENT_LOCATION,
 						VALUE => [PR_ATTACH_CONTENT_LOCATION => $this->attachCid],
 					],
 				],
 				[RES_CONTENT,
 					[
-						FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+						FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 						ULPROPTAG => PR_ATTACH_FILENAME,
 						VALUE => [PR_ATTACH_FILENAME => $this->attachCid],
 					],