grommunio / grommunio-web

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],
 					],

server/includes/util.php

Spacing +2 added lines, -2 removed lines

@@ -574,7 +574,7 @@ 
 		// mark the message as read if the main message has read flag
 		if ($read) {
 			$mprops = mapi_getprops($message, [PR_MESSAGE_FLAGS]);
-			mapi_setprops($message, [PR_MESSAGE_FLAGS => $mprops[PR_MESSAGE_FLAGS] | MSGFLAG_READ]);
+			mapi_setprops($message, [PR_MESSAGE_FLAGS => $mprops[PR_MESSAGE_FLAGS]|MSGFLAG_READ]);
 		}
 	}
 
@@ -716,7 +716,7 @@ 
 			$rootFolder = getSubTree($store);
 		}
 
-		$hierarchy = mapi_folder_gethierarchytable($rootFolder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+		$hierarchy = mapi_folder_gethierarchytable($rootFolder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 		$rows = mapi_table_queryallrows($hierarchy, $props);
 
 		// Append the Inbox folder itself.

server/includes/modules/class.addressbooklistmodule.php

Spacing +11 added lines, -11 removed lines

@@ -201,7 +201,7 @@ 
 							// Display name of user from GAB and contacts.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_DISPLAY_NAME,
 									VALUE => $searchstring,
 								],
@@ -209,7 +209,7 @@ 
 							// fileas value of user from GAB.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_ACCOUNT,
 									VALUE => $searchstring,
 								],
@@ -217,7 +217,7 @@ 
 							// smtp_address of user from GAB.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_SMTP_ADDRESS,
 									VALUE => $searchstring,
 								],
@@ -225,7 +225,7 @@ 
 							// email_address of user from GAB and contacts.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_EMAIL_ADDRESS,
 									VALUE => $searchstring,
 								],
@@ -233,7 +233,7 @@ 
 							// department of user from GAB.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_DEPARTMENT_NAME,
 									VALUE => $searchstring,
 								],
@@ -241,7 +241,7 @@ 
 							// fileas of user from Contacts.
 							[
 								RES_CONTENT,
-								[FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								[FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 									ULPROPTAG => PR_ORIGINAL_DISPLAY_NAME,
 									VALUE => $searchstring,
 								],
@@ -617,7 +617,7 @@ 
 						[
 							RES_CONTENT,
 							[
-								FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+								FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 								ULPROPTAG => PR_ACCOUNT,
 								VALUE => [
 									PR_ACCOUNT => 'SYSTEM',
@@ -761,7 +761,7 @@ 
 								RELOP => RELOP_EQ,
 								ULPROPTAG => PR_DISPLAY_TYPE_EX,
 								VALUE => [
-									PR_DISPLAY_TYPE_EX => (DT_SEC_DISTLIST | DTE_FLAG_ACL_CAPABLE),
+									PR_DISPLAY_TYPE_EX => (DT_SEC_DISTLIST|DTE_FLAG_ACL_CAPABLE),
 								],
 							],
 						]
@@ -806,7 +806,7 @@ 
 						[
 							RES_CONTENT,
 							[
-								FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+								FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 								ULPROPTAG => PR_ACCOUNT,
 								VALUE => [
 									PR_ACCOUNT => 'Everyone',
@@ -850,7 +850,7 @@ 
 									],
 									[
 										RES_OR,
-										$tempRestrictions,     // all group restrictions
+										$tempRestrictions, // all group restrictions
 									],
 								],
 							],
@@ -923,7 +923,7 @@ 
 		public function getAddressbookHierarchy($hideContacts = false) {
 			$ab = $GLOBALS["mapisession"]->getAddressbook(false, true);
 			$dir = mapi_ab_openentry($ab);
-			$table = mapi_folder_gethierarchytable($dir, MAPI_DEFERRED_ERRORS | CONVENIENT_DEPTH);
+			$table = mapi_folder_gethierarchytable($dir, MAPI_DEFERRED_ERRORS|CONVENIENT_DEPTH);
 
 			if ($hideContacts) {
 				// Restrict on the addressbook provider GUID if the contact folders need to be hidden

server/includes/modules/class.restoreitemslistmodule.php

Spacing +9 added lines, -9 removed lines

@@ -98,7 +98,7 @@ 
 
 			// delete all folders.
 			if (isset($action["itemType"]) && $action["itemType"] == "folder") {
-				$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$items = mapi_table_queryallrows($table, [PR_ENTRYID]);
 				$restoreItems = [];
 				foreach ($items as $item) {
@@ -106,12 +106,12 @@ 
 				}
 
 				foreach ($restoreItems as $restoreItem) {
-					mapi_folder_deletefolder($folder, $restoreItem, DEL_FOLDERS | DEL_MESSAGES | DELETE_HARD_DELETE);
+					mapi_folder_deletefolder($folder, $restoreItem, DEL_FOLDERS|DEL_MESSAGES|DELETE_HARD_DELETE);
 				}
 			}
 			else {
 				// delete all messages
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$items = mapi_table_queryallrows($table, [PR_ENTRYID]);
 
 				$restoreItems = [];
@@ -135,7 +135,7 @@ 
 		 * @throws MAPIException
 		 */
 		public function restoreAllFolders($store, $folder) {
-			$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+			$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 			$items = mapi_table_queryallrows($table, [PR_ENTRYID]);
 			$restoreItems = [];
 			foreach ($items as $item) {
@@ -175,7 +175,7 @@ 
 		 * @param {object} $folder the content of this folder is going to restored
 		 */
 		public function restoreAllItems($folder) {
-			$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+			$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 			$items = mapi_table_queryallrows($table, [PR_ENTRYID]);
 
 			$restoreItems = [];
@@ -251,10 +251,10 @@ 
 			$folder = mapi_msgstore_openentry($store, $entryid);
 
 			if (isset($action["itemType"]) && $action["itemType"] == "folder") {
-				$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_gethierarchytable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 			}
 			else {
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 			}
 
 			$data = $GLOBALS["operations"]->getTableContent($table, $this->properties, $this->sort, $this->start, $limit, $this->restriction);
@@ -333,7 +333,7 @@ 
 			$sfolder = mapi_msgstore_openentry($store, $parententryid);
 
 			for ($index = 0, $len = count($folders); $index < $len; ++$index) {
-				mapi_folder_deletefolder($sfolder, hex2bin($folders[$index]['entryid']), DEL_FOLDERS | DEL_MESSAGES | DELETE_HARD_DELETE);
+				mapi_folder_deletefolder($sfolder, hex2bin($folders[$index]['entryid']), DEL_FOLDERS|DEL_MESSAGES|DELETE_HARD_DELETE);
 			}
 
 			$this->sendFeedback(true);
@@ -388,7 +388,7 @@ 
 			 * folder gets changed and we don't have notification system to get new entryid, so to notify client about changes we need to
 			 * notify all subfolders of parent folder where we have restored the folder
 			 */
-			$hierarchyTable = mapi_folder_gethierarchytable($folder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+			$hierarchyTable = mapi_folder_gethierarchytable($folder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 			mapi_table_sort($hierarchyTable, [PR_DISPLAY_NAME => TABLE_SORT_ASCEND], TBL_BATCH);
 
 			$subfolders = mapi_table_queryallrows($hierarchyTable, [PR_ENTRYID]);