grommunio / grommunio-web

plugins/smime/php/plugin.smime.php

Spacing +3 added lines, -3 removed lines

@@ -454,7 +454,7 @@ 
 		}
 
 		if (!encryptionStoreExpirationSupport()) {
-			withPHPSession(function () use ($encryptionStore) {
+			withPHPSession(function() use ($encryptionStore) {
 				$encryptionStore->add('smime', '');
 			});
 		}
@@ -678,7 +678,7 @@ 
 			}
 
 			// Save the signed message as attachment of the send email
-			$stream = mapi_openproperty($signedAttach, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($signedAttach, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 			$handle = fopen($tmpSendSmimeEmail, 'r');
 			while (!feof($handle)) {
 				$contents = fread($handle, BLOCK_SIZE);
@@ -1003,7 +1003,7 @@ 
 			]);
 			// Save attachment
 			$msgBody = base64_encode($cert);
-			$stream = mapi_openproperty($assocMessage, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($assocMessage, PR_BODY, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, strlen($msgBody));
 			mapi_stream_write($stream, $msgBody);
 			mapi_stream_commit($stream);

plugins/smime/php/class.pluginsmimemodule.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 							if ($data === CHANGE_PASSPHRASE_SUCCESS) {
 								// Reset cached passphrase.
 								$encryptionStore = EncryptionStore::getInstance();
-								withPHPSession(function () use ($encryptionStore) {
+								withPHPSession(function() use ($encryptionStore) {
 									$encryptionStore->add('smime', '');
 								});
 							}
@@ -169,7 +169,7 @@ 
 				$encryptionStore->add('smime', $data['passphrase'], time() + (5 * 60));
 			}
 			else {
-				withPHPSession(function () use ($encryptionStore, $data) {
+				withPHPSession(function() use ($encryptionStore, $data) {
 					$encryptionStore->add('smime', $data['passphrase']);
 				});
 			}
@@ -265,7 +265,7 @@ 
 		$privateCert = mapi_msgstore_openentry($this->store, $mapiCert[PR_ENTRYID]);
 
 		$msgBody = base64_encode($cert);
-		$stream = mapi_openproperty($privateCert, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+		$stream = mapi_openproperty($privateCert, PR_BODY, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 		mapi_stream_setsize($stream, strlen($msgBody));
 		mapi_stream_write($stream, $msgBody);
 		mapi_stream_commit($stream);

server/includes/mapi/class.recurrence.php

Spacing +12 added lines, -12 removed lines

@@ -739,7 +739,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);
@@ -1120,13 +1120,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']);
@@ -1195,13 +1195,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;
 						}
 					}
@@ -1261,12 +1261,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;
 				}
 			}
 
@@ -1280,7 +1280,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.

server/includes/mapi/mapidefs.php

Spacing +104 added lines, -104 removed lines

@@ -28,40 +28,40 @@ 
 
 /* Object type */
 
-define('MAPI_STORE', 0x00000001);    /* Message Store */
-define('MAPI_ADDRBOOK', 0x00000002);    /* Address Book */
-define('MAPI_FOLDER', 0x00000003);    /* Folder */
-define('MAPI_ABCONT', 0x00000004);    /* Address Book Container */
-define('MAPI_MESSAGE', 0x00000005);    /* Message */
-define('MAPI_MAILUSER', 0x00000006);    /* Individual Recipient */
-define('MAPI_ATTACH', 0x00000007);    /* Attachment */
-define('MAPI_DISTLIST', 0x00000008);    /* Distribution List Recipient */
-define('MAPI_PROFSECT', 0x00000009);    /* Profile Section */
-define('MAPI_STATUS', 0x0000000A);    /* Status Object */
-define('MAPI_SESSION', 0x0000000B);    /* Session */
-define('MAPI_FORMINFO', 0x0000000C);    /* Form Information */
+define('MAPI_STORE', 0x00000001); /* Message Store */
+define('MAPI_ADDRBOOK', 0x00000002); /* Address Book */
+define('MAPI_FOLDER', 0x00000003); /* Folder */
+define('MAPI_ABCONT', 0x00000004); /* Address Book Container */
+define('MAPI_MESSAGE', 0x00000005); /* Message */
+define('MAPI_MAILUSER', 0x00000006); /* Individual Recipient */
+define('MAPI_ATTACH', 0x00000007); /* Attachment */
+define('MAPI_DISTLIST', 0x00000008); /* Distribution List Recipient */
+define('MAPI_PROFSECT', 0x00000009); /* Profile Section */
+define('MAPI_STATUS', 0x0000000A); /* Status Object */
+define('MAPI_SESSION', 0x0000000B); /* Session */
+define('MAPI_FORMINFO', 0x0000000C); /* Form Information */
 
 define('MV_FLAG', 0x1000);
 define('MV_INSTANCE', 0x2000);
-define('MVI_FLAG', MV_FLAG | MV_INSTANCE);
-
-define('PT_UNSPECIFIED', 0);    /* (Reserved for interface use) type doesn't matter to caller */
-define('PT_NULL', 1);    /* NULL property value */
-define('PT_I2', 2);    /* Signed 16-bit value */
-define('PT_LONG', 3);    /* Signed 32-bit value */
-define('PT_R4', 4);    /* 4-byte floating point */
-define('PT_DOUBLE', 5);    /* Floating point double */
-define('PT_CURRENCY', 6);    /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
-define('PT_APPTIME', 7);    /* Application time */
-define('PT_ERROR', 10);    /* 32-bit error value */
-define('PT_BOOLEAN', 11);    /* 16-bit boolean (non-zero true) */
-define('PT_OBJECT', 13);    /* Embedded object in a property */
-define('PT_I8', 20);    /* 8-byte signed integer */
-define('PT_STRING8', 30);    /* Null terminated 8-bit character string */
-define('PT_UNICODE', 31);    /* Null terminated Unicode string */
-define('PT_SYSTIME', 64);    /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
-define('PT_CLSID', 72);    /* OLE GUID */
-define('PT_BINARY', 258);   /* Uninterpreted (counted byte array) */
+define('MVI_FLAG', MV_FLAG|MV_INSTANCE);
+
+define('PT_UNSPECIFIED', 0); /* (Reserved for interface use) type doesn't matter to caller */
+define('PT_NULL', 1); /* NULL property value */
+define('PT_I2', 2); /* Signed 16-bit value */
+define('PT_LONG', 3); /* Signed 32-bit value */
+define('PT_R4', 4); /* 4-byte floating point */
+define('PT_DOUBLE', 5); /* Floating point double */
+define('PT_CURRENCY', 6); /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
+define('PT_APPTIME', 7); /* Application time */
+define('PT_ERROR', 10); /* 32-bit error value */
+define('PT_BOOLEAN', 11); /* 16-bit boolean (non-zero true) */
+define('PT_OBJECT', 13); /* Embedded object in a property */
+define('PT_I8', 20); /* 8-byte signed integer */
+define('PT_STRING8', 30); /* Null terminated 8-bit character string */
+define('PT_UNICODE', 31); /* Null terminated Unicode string */
+define('PT_SYSTIME', 64); /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
+define('PT_CLSID', 72); /* OLE GUID */
+define('PT_BINARY', 258); /* Uninterpreted (counted byte array) */
 /* Changes are likely to these numbers, and to their structures. */
 
 /* Alternate property type names for ease of use */
@@ -73,18 +73,18 @@ 
 
 define('PT_TSTRING', PT_STRING8);
 
-define('PT_MV_I2', (MV_FLAG | PT_I2));
-define('PT_MV_LONG', (MV_FLAG | PT_LONG));
-define('PT_MV_R4', (MV_FLAG | PT_R4));
-define('PT_MV_DOUBLE', (MV_FLAG | PT_DOUBLE));
-define('PT_MV_CURRENCY', (MV_FLAG | PT_CURRENCY));
-define('PT_MV_APPTIME', (MV_FLAG | PT_APPTIME));
-define('PT_MV_SYSTIME', (MV_FLAG | PT_SYSTIME));
-define('PT_MV_STRING8', (MV_FLAG | PT_STRING8));
-define('PT_MV_BINARY', (MV_FLAG | PT_BINARY));
-define('PT_MV_UNICODE', (MV_FLAG | PT_UNICODE));
-define('PT_MV_CLSID', (MV_FLAG | PT_CLSID));
-define('PT_MV_I8', (MV_FLAG | PT_I8));
+define('PT_MV_I2', (MV_FLAG|PT_I2));
+define('PT_MV_LONG', (MV_FLAG|PT_LONG));
+define('PT_MV_R4', (MV_FLAG|PT_R4));
+define('PT_MV_DOUBLE', (MV_FLAG|PT_DOUBLE));
+define('PT_MV_CURRENCY', (MV_FLAG|PT_CURRENCY));
+define('PT_MV_APPTIME', (MV_FLAG|PT_APPTIME));
+define('PT_MV_SYSTIME', (MV_FLAG|PT_SYSTIME));
+define('PT_MV_STRING8', (MV_FLAG|PT_STRING8));
+define('PT_MV_BINARY', (MV_FLAG|PT_BINARY));
+define('PT_MV_UNICODE', (MV_FLAG|PT_UNICODE));
+define('PT_MV_CLSID', (MV_FLAG|PT_CLSID));
+define('PT_MV_I8', (MV_FLAG|PT_I8));
 
 define('PT_MV_TSTRING', PT_MV_STRING8);
 /* bit 0: set if descending, clear if ascending */
@@ -202,14 +202,14 @@ 
 
 /* Values for PR_RESOURCE_TYPE, _METHODS, _FLAGS */
 
-define('MAPI_STORE_PROVIDER', 33);    /* Message Store */
-define('MAPI_AB', 34);    /* Address Book */
-define('MAPI_AB_PROVIDER', 35);    /* Address Book Provider */
-define('MAPI_TRANSPORT_PROVIDER', 36);    /* Transport Provider */
-define('MAPI_SPOOLER', 37);    /* Message Spooler */
-define('MAPI_PROFILE_PROVIDER', 38);    /* Profile Provider */
-define('MAPI_SUBSYSTEM', 39);    /* Overall Subsystem Status */
-define('MAPI_HOOK_PROVIDER', 40);    /* Spooler Hook */
+define('MAPI_STORE_PROVIDER', 33); /* Message Store */
+define('MAPI_AB', 34); /* Address Book */
+define('MAPI_AB_PROVIDER', 35); /* Address Book Provider */
+define('MAPI_TRANSPORT_PROVIDER', 36); /* Transport Provider */
+define('MAPI_SPOOLER', 37); /* Message Spooler */
+define('MAPI_PROFILE_PROVIDER', 38); /* Profile Provider */
+define('MAPI_SUBSYSTEM', 39); /* Overall Subsystem Status */
+define('MAPI_HOOK_PROVIDER', 40); /* Spooler Hook */
 define('STATUS_VALIDATE_STATE', 0x00000001);
 define('STATUS_SETTINGS_DIALOG', 0x00000002);
 define('STATUS_CHANGE_PASSWORD', 0x00000004);
@@ -255,10 +255,10 @@ 
 define('MODRECIP_MODIFY', 0x00000004);
 define('MODRECIP_REMOVE', 0x00000008);
 
-define('MAPI_ORIG', 0);          /* Recipient is message originator */
-define('MAPI_TO', 1);          /* Recipient is a primary recipient */
-define('MAPI_CC', 2);          /* Recipient is a copy recipient */
-define('MAPI_BCC', 3);          /* Recipient is blind copy recipient */
+define('MAPI_ORIG', 0); /* Recipient is message originator */
+define('MAPI_TO', 1); /* Recipient is a primary recipient */
+define('MAPI_CC', 2); /* Recipient is a copy recipient */
+define('MAPI_BCC', 3); /* Recipient is blind copy recipient */
 
 /* IAttach Interface ------------------------------------------------------- */
 
@@ -450,23 +450,23 @@ 
 define('BMR_NEZ', 0x00000001);
 
 /* array index values of restrictions -- same values are used in php-ext/main.cpp::PHPArraytoSRestriction() */
-define('VALUE', 0);        // propval
-define('RELOP', 1);        // compare method
-define('FUZZYLEVEL', 2);        // string search flags
-define('CB', 3);        // size restriction
-define('ULTYPE', 4);        // bit mask restriction type BMR_xxx
-define('ULMASK', 5);        // bitmask
-define('ULPROPTAG', 6);        // property
-define('ULPROPTAG1', 7);        // RES_COMPAREPROPS 1st property
-define('ULPROPTAG2', 8);        // RES_COMPAREPROPS 2nd property
-define('PROPS', 9);        // RES_COMMENT properties
-define('RESTRICTION', 10);        // RES_COMMENT and RES_SUBRESTRICTION restriction
+define('VALUE', 0); // propval
+define('RELOP', 1); // compare method
+define('FUZZYLEVEL', 2); // string search flags
+define('CB', 3); // size restriction
+define('ULTYPE', 4); // bit mask restriction type BMR_xxx
+define('ULMASK', 5); // bitmask
+define('ULPROPTAG', 6); // property
+define('ULPROPTAG1', 7); // RES_COMPAREPROPS 1st property
+define('ULPROPTAG2', 8); // RES_COMPAREPROPS 2nd property
+define('PROPS', 9); // RES_COMMENT properties
+define('RESTRICTION', 10); // RES_COMMENT and RES_SUBRESTRICTION restriction
 
 /* GUID's for PR_MDB_PROVIDER */
-define("ZARAFA_SERVICE_GUID", makeGuid("{C0A19454-7F29-1B10-A587-08002B2A2517}"));    // default store
-define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}"));    // public store
-define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{0077B49E-E474-CE11-8C5E-00AA004254E2}"));    // other store
-define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
+define("ZARAFA_SERVICE_GUID", makeGuid("{C0A19454-7F29-1B10-A587-08002B2A2517}")); // default store
+define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}")); // public store
+define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{0077B49E-E474-CE11-8C5E-00AA004254E2}")); // other store
+define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}")); // archive store
 
 /* global profile section guid */
 define('pbGlobalProfileSectionGuid', makeGuid("{C8B0DB13-05AA-1A10-9BB0-00AA002FC45A}"));
@@ -498,18 +498,18 @@ 
 define('ecRightsContact', 0x00000200);
 define('ecRightsFolderVisible', 0x00000400);
 
-define('ecRightsAll', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderAccess | ecRightsFolderVisible);
-define('ecRightsSecretary', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsFolderVisible);
-define('ecRightsFullControl', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderVisible);
-define('ecRightsContributor', ecRightsFolderVisible | ecRightsCreate);
-define('ecRightsReviewer', ecRightsReadAny | ecRightsFolderVisible);
-define('ecRightsNonEditingAuthor', ecRightsReadAny | ecRightsFolderVisible | ecRightsCreate | ecRightsDeleteOwned);
-define('ecRightsAuthor', ecRightsReadAny | ecRightsFolderVisible | ecRightsCreate | ecRightsDeleteOwned | ecRightsEditOwned);
-define('ecRightsPublishingAuthor', ecRightsReadAny | ecRightsFolderVisible | ecRightsCreate | ecRightsDeleteOwned | ecRightsEditOwned | ecRightsCreateSubfolder);
-define('ecRightsEditor', ecRightsReadAny | ecRightsFolderVisible | ecRightsCreate | ecRightsDeleteOwned | ecRightsEditOwned | ecRightsEditAny | ecRightsDeleteAny);
-define('ecRightsPublishingEditor', ecRightsReadAny | ecRightsFolderVisible | ecRightsCreate | ecRightsDeleteOwned | ecRightsEditOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder);
-define('ecRightsDefault', ecRightsNone | ecRightsFolderVisible);
-define('ecRightsDefaultPublic', ecRightsReadAny | ecRightsFolderVisible);
+define('ecRightsAll', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderAccess|ecRightsFolderVisible);
+define('ecRightsSecretary', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsFolderVisible);
+define('ecRightsFullControl', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderVisible);
+define('ecRightsContributor', ecRightsFolderVisible|ecRightsCreate);
+define('ecRightsReviewer', ecRightsReadAny|ecRightsFolderVisible);
+define('ecRightsNonEditingAuthor', ecRightsReadAny|ecRightsFolderVisible|ecRightsCreate|ecRightsDeleteOwned);
+define('ecRightsAuthor', ecRightsReadAny|ecRightsFolderVisible|ecRightsCreate|ecRightsDeleteOwned|ecRightsEditOwned);
+define('ecRightsPublishingAuthor', ecRightsReadAny|ecRightsFolderVisible|ecRightsCreate|ecRightsDeleteOwned|ecRightsEditOwned|ecRightsCreateSubfolder);
+define('ecRightsEditor', ecRightsReadAny|ecRightsFolderVisible|ecRightsCreate|ecRightsDeleteOwned|ecRightsEditOwned|ecRightsEditAny|ecRightsDeleteAny);
+define('ecRightsPublishingEditor', ecRightsReadAny|ecRightsFolderVisible|ecRightsCreate|ecRightsDeleteOwned|ecRightsEditOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder);
+define('ecRightsDefault', ecRightsNone|ecRightsFolderVisible);
+define('ecRightsDefaultPublic', ecRightsReadAny|ecRightsFolderVisible);
 define('ecRightsAdmin', 0x00001000);
 define('ecRightsAllMask', 0x000015FB);
 
@@ -525,7 +525,7 @@ 
 define('ROW_ADD', 0x0001);
 define('ROW_MODIFY', 0x0002);
 define('ROW_REMOVE', 0x0004);
-define('ROW_EMPTY', (ROW_ADD | ROW_REMOVE));
+define('ROW_EMPTY', (ROW_ADD|ROW_REMOVE));
 
 // new property types
 define('PT_SRESTRICTION', 0x00FD);
@@ -595,38 +595,38 @@ 
 define('SYNC_NO_FOREIGN_KEYS', 0x100);
 define('SYNC_LIMITED_IMESSAGE', 0x200);
 define('SYNC_CATCHUP', 0x400);
-define('SYNC_NEW_MESSAGE', 0x800);         // only applicable to ImportMessageChange()
-define('SYNC_MSG_SELECTIVE', 0x1000);        // Used internally.      Will reject if used by clients.
+define('SYNC_NEW_MESSAGE', 0x800); // only applicable to ImportMessageChange()
+define('SYNC_MSG_SELECTIVE', 0x1000); // Used internally.      Will reject if used by clients.
 define('SYNC_BEST_BODY', 0x2000);
 define('SYNC_IGNORE_SPECIFIED_ON_ASSOCIATED', 0x4000);
-define('SYNC_PROGRESS_MODE', 0x8000);        // AirMapi progress mode
+define('SYNC_PROGRESS_MODE', 0x8000); // AirMapi progress mode
 define('SYNC_FXRECOVERMODE', 0x10000);
 define('SYNC_DEFER_CONFIG', 0x20000);
-define('SYNC_FORCE_UNICODE', 0x40000);       // Forces server to return Unicode properties
-define('SYNC_STATE_READONLY', 0x80000);       // Server will not update the states in the DB, setting up exporter with this flag states are read only
+define('SYNC_FORCE_UNICODE', 0x40000); // Forces server to return Unicode properties
+define('SYNC_STATE_READONLY', 0x80000); // Server will not update the states in the DB, setting up exporter with this flag states are read only
 
-define('EMS_AB_ADDRESS_LOOKUP', 0x00000001);    // Flag for resolvename to resolve only exact matches
+define('EMS_AB_ADDRESS_LOOKUP', 0x00000001); // Flag for resolvename to resolve only exact matches
 
-define('TBL_BATCH', 0x00000002);    // Batch multiple table commands
+define('TBL_BATCH', 0x00000002); // Batch multiple table commands
 
 /* Flags for recipients in exceptions */
-define('recipSendable', 0x00000001);    // sendable attendee.
-define('recipOrganizer', 0x00000002);    // meeting organizer
-define('recipExceptionalResponse', 0x00000010);    // attendee gave a response for the exception
-define('recipExceptionalDeleted', 0x00000020);    // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
-define('recipOriginal', 0x00000100);    // recipient is an original Attendee
+define('recipSendable', 0x00000001); // sendable attendee.
+define('recipOrganizer', 0x00000002); // meeting organizer
+define('recipExceptionalResponse', 0x00000010); // attendee gave a response for the exception
+define('recipExceptionalDeleted', 0x00000020); // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
+define('recipOriginal', 0x00000100); // recipient is an original Attendee
 define('recipReserved', 0x00000200);
 
 /* Flags which indicates type of Meeting Object */
-define('mtgEmpty', 0x00000000);    // Unspecified.
-define('mtgRequest', 0x00000001);    // Initial meeting request.
-define('mtgFull', 0x00010000);    // Full update.
-define('mtgInfo', 0x00020000);    // Informational update.
-define('mtgOutOfDate', 0x00080000);    // A newer Meeting Request object or Meeting Update object was received after this one.
-define('mtgDelegatorCopy', 0x00100000);    // This is set on the delegator's copy when a delegate will handle meeting-related objects.
-
-define('MAPI_ONE_OFF_UNICODE', 0x8000);        // the flag that defines whether the embedded strings are Unicode in one off entryids.
-define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001);        // the flag that specifies whether the recipient gets TNEF or not.
+define('mtgEmpty', 0x00000000); // Unspecified.
+define('mtgRequest', 0x00000001); // Initial meeting request.
+define('mtgFull', 0x00010000); // Full update.
+define('mtgInfo', 0x00020000); // Informational update.
+define('mtgOutOfDate', 0x00080000); // A newer Meeting Request object or Meeting Update object was received after this one.
+define('mtgDelegatorCopy', 0x00100000); // This is set on the delegator's copy when a delegate will handle meeting-related objects.
+
+define('MAPI_ONE_OFF_UNICODE', 0x8000); // the flag that defines whether the embedded strings are Unicode in one off entryids.
+define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001); // the flag that specifies whether the recipient gets TNEF or not.
 
 /* Mask flags for mapi_msgstore_advise */
 define('fnevCriticalError', 0x00000001);

server/includes/mapi/class.meetingrequest.php

Spacing +18 added lines, -18 removed lines

@@ -133,14 +133,14 @@ 
 		$properties['recurrence_data'] = 'PT_BINARY:PSETID_Appointment:0x8216';
 		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
 		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
-		$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['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";
@@ -149,11 +149,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';
@@ -526,7 +526,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;
 		}
@@ -1460,7 +1460,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;
 		}
 
@@ -2309,12 +2309,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;
 			}
 		}
 
@@ -2328,7 +2328,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.
@@ -2511,7 +2511,7 @@ 
 		// Get resource recipients
 		$getResourcesRestriction = [RES_AND,
 			[[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],
 				],
@@ -2787,7 +2787,7 @@ 
 		// Get resource recipients
 		$getResourcesRestriction = [RES_AND,
 			[[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],
 				],
@@ -2999,7 +2999,7 @@ 
 			// In direct-booking mode, we don't need to send cancellations to resources
 			if ($this->enableDirectBooking) {
 				$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],
 					],
@@ -3096,7 +3096,7 @@ 
 		if ($this->enableDirectBooking) {
 			$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],
 										],
@@ -3202,7 +3202,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];
 			}

server/includes/mapi/class.taskrequest.php

Spacing +32 added lines, -32 removed lines

@@ -19,12 +19,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.
@@ -34,22 +34,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);
@@ -59,13 +59,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);
@@ -293,7 +293,7 @@ 
 					VALUE => $goid, ],
 				];
 
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$softDeletedItems = mapi_table_queryallrows($table, [PR_ENTRYID], $restriction);
 				if (!empty($softDeletedItems)) {
 					return true;
@@ -500,12 +500,12 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['task_goid'] => $taskid, /* our new task_goid */
-				$this->props['taskstate'] => tdsACC, 		/* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing, 	/* we're not sending a change */
-				$this->props['updatecount'] => 2,			/* version 2 (no idea) */
+				$this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+				$this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+				$this->props['updatecount'] => 2, /* version 2 (no idea) */
 				$this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,	/* Task has been assigned */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
 				PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
 				PR_ICON_INDEX => ICON_TASK_ASSIGNER,
 			]);
@@ -522,10 +522,10 @@ 
 
 			// Make it a task request, and put it in sent items after it is sent
 			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest", 		/* class is task request */
-				$this->props['taskstate'] => tdsOWN, 	    /* for the recipient he is the task owner */
-				$this->props['taskmode'] => tdmtTaskReq,	/* for the recipient it's a request */
-				$this->props['updatecount'] => 1,			/* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT_PREFIX => $prefix,
 				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
 			]);
@@ -536,7 +536,7 @@ 
 				PR_ATTACHMENT_HIDDEN => true,
 				PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], ]);
 
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
 			mapi_copyto($this->message, [], [], $sub);
 			mapi_setprops($sub, [PR_MESSAGE_CLASS => 'IPM.Task']);
@@ -876,7 +876,7 @@ 
 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true]);
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
 			$message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -927,7 +927,7 @@ 
 			// edit response before sending task response.
 			if ($this->taskCommentsInfo) {
 				$comments = $this->getTaskCommentsInfo();
-				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($comments));
 				mapi_stream_write($stream, $comments);
 				mapi_stream_commit($stream);
@@ -1181,7 +1181,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]);
 				}
 

server/includes/mapi/class.baserecurrence.php

Spacing +7 added lines, -7 removed lines

@@ -840,11 +840,11 @@ 
 
 								$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;
 									}
@@ -883,11 +883,11 @@ 
 							// 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;
 								}
@@ -1130,11 +1130,11 @@ 
 									}
 
 									for ($i = 0; $i < 7; ++$i) {
-										if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
+										if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7))&$weekdays) {
 											$occenddate -= $i * 24 * 60 * 60;
 											break;
 										}
-										if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
+										if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7))&$weekdays) {
 											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
 											break;
 										}
@@ -1896,7 +1896,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) {

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);