grommunio / mapi-header-php

class.taskrequest.php

Spacing +20 added lines, -20 removed lines

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

mapidefs.php

Spacing +104 added lines, -104 removed lines

@@ -16,40 +16,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('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 */
@@ -190,14 +190,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_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_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);
@@ -243,10 +243,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 ------------------------------------------------------- */
 
@@ -307,26 +307,26 @@ 
 define('MAPI_SEND_NO_RICH_INFO', 0x00010000);
 
 /* flags for PR_STORE_SUPPORT_MASK */
-define('STORE_ANSI_OK', 0x00020000);          // The message store supports properties containing ANSI (8-bit) characters.
-define('STORE_ATTACH_OK', 0x00000020);        // The message store supports attachments (OLE or non-OLE) to messages.
-define('STORE_CATEGORIZE_OK', 0x00000400);    // The message store supports categorized views of tables.
-define('STORE_CREATE_OK', 0x00000010);        // The message store supports creation of new messages.
-define('STORE_ENTRYID_UNIQUE', 0x00000001);   // Entry identifiers for the objects in the message store are unique, that is, never reused during the life of the store.
-define('STORE_HTML_OK', 0x00010000);          // The message store supports Hypertext Markup Language (HTML) messages, stored in the PR_BODY_HTML property. Note that STORE_HTML_OK is not defined in versions of MAPIDEFS.H included with Microsoft� Exchange 2000 Server and earlier. If your development environment uses a MAPIDEFS.H file that does not include STORE_HTML_OK, use the value 0x00010000 instead.
-define('STORE_LOCALSTORE', 0x00080000);       // This flag is reserved and should not be used.
-define('STORE_MODIFY_OK', 0x00000008);        // The message store supports modification of its existing messages.
-define('STORE_MV_PROPS_OK', 0x00000200);      // The message store supports multivalued properties, guarantees the stability of value order in a multivalued property throughout a save operation, and supports instantiation of multivalued properties in tables.
-define('STORE_NOTIFY_OK', 0x00000100);        // The message store supports notifications.
-define('STORE_OLE_OK', 0x00000040);           // The message store supports OLE attachments. The OLE data is accessible through an IStorage interface, such as that available through the PR_ATTACH_DATA_OBJ property.
-define('STORE_PUBLIC_FOLDERS', 0x00004000);   // The folders in this store are public (multi-user), not private (possibly multi-instance but not multi-user).
-define('STORE_READONLY', 0x00000002);         // All interfaces for the message store have a read-only access level.
-define('STORE_RESTRICTION_OK', 0x00001000);   // The message store supports restrictions.
-define('STORE_RTF_OK', 0x00000800);           // The message store supports Rich Text Format (RTF) messages, usually stored compressed, and the store itself keeps PR_BODY and PR_RTF_COMPRESSED synchronized.
-define('STORE_SEARCH_OK', 0x00000004);        // The message store supports search-results folders.
-define('STORE_SORT_OK', 0x00002000);          // The message store supports sorting views of tables.
-define('STORE_SUBMIT_OK', 0x00000080);        // The message store supports marking a message for submission.
+define('STORE_ANSI_OK', 0x00020000); // The message store supports properties containing ANSI (8-bit) characters.
+define('STORE_ATTACH_OK', 0x00000020); // The message store supports attachments (OLE or non-OLE) to messages.
+define('STORE_CATEGORIZE_OK', 0x00000400); // The message store supports categorized views of tables.
+define('STORE_CREATE_OK', 0x00000010); // The message store supports creation of new messages.
+define('STORE_ENTRYID_UNIQUE', 0x00000001); // Entry identifiers for the objects in the message store are unique, that is, never reused during the life of the store.
+define('STORE_HTML_OK', 0x00010000); // The message store supports Hypertext Markup Language (HTML) messages, stored in the PR_BODY_HTML property. Note that STORE_HTML_OK is not defined in versions of MAPIDEFS.H included with Microsoft� Exchange 2000 Server and earlier. If your development environment uses a MAPIDEFS.H file that does not include STORE_HTML_OK, use the value 0x00010000 instead.
+define('STORE_LOCALSTORE', 0x00080000); // This flag is reserved and should not be used.
+define('STORE_MODIFY_OK', 0x00000008); // The message store supports modification of its existing messages.
+define('STORE_MV_PROPS_OK', 0x00000200); // The message store supports multivalued properties, guarantees the stability of value order in a multivalued property throughout a save operation, and supports instantiation of multivalued properties in tables.
+define('STORE_NOTIFY_OK', 0x00000100); // The message store supports notifications.
+define('STORE_OLE_OK', 0x00000040); // The message store supports OLE attachments. The OLE data is accessible through an IStorage interface, such as that available through the PR_ATTACH_DATA_OBJ property.
+define('STORE_PUBLIC_FOLDERS', 0x00004000); // The folders in this store are public (multi-user), not private (possibly multi-instance but not multi-user).
+define('STORE_READONLY', 0x00000002); // All interfaces for the message store have a read-only access level.
+define('STORE_RESTRICTION_OK', 0x00001000); // The message store supports restrictions.
+define('STORE_RTF_OK', 0x00000800); // The message store supports Rich Text Format (RTF) messages, usually stored compressed, and the store itself keeps PR_BODY and PR_RTF_COMPRESSED synchronized.
+define('STORE_SEARCH_OK', 0x00000004); // The message store supports search-results folders.
+define('STORE_SORT_OK', 0x00002000); // The message store supports sorting views of tables.
+define('STORE_SUBMIT_OK', 0x00000080); // The message store supports marking a message for submission.
 define('STORE_UNCOMPRESSED_RTF', 0x00008000); // The message store supports storage of Rich Text Format (RTF) messages in uncompressed form. An uncompressed RTF stream is identified by the value dwMagicUncompressedRTF in the stream header. The dwMagicUncompressedRTF value is defined in the RTFLIB.H file.
-define('STORE_UNICODE_OK', 0x00040000);       // The message store supports properties containing Unicode characters.
+define('STORE_UNICODE_OK', 0x00040000); // The message store supports properties containing Unicode characters.
 
 /*  PR_DISPLAY_TYPEs */
 /*  For address book contents tables */
@@ -439,21 +439,21 @@ 
 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('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_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
 
@@ -586,38 +586,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('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('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);
@@ -634,21 +634,21 @@ 
 define('fnevExtended', 0x80000000);
 
 /* PersistBlockType values PR_ADDITIONAL_REN_ENTRYIDS_EX / PR_ADDITIONAL_REN_ENTRYIDS_EX PersistIDs */
-define('PERSIST_SENTINEL', 0x0000);            // Indicates that the PersistData structure is the last one contained in the PidTagAdditionalRenEntryIdsEx property
-define('RSF_PID_RSS_SUBSCRIPTION', 0x8001);    // Indicates that the structure contains data for the RSS Feeds folder
-define('RSF_PID_SEND_AND_TRACK', 0x8002);      // Indicates that the structure contains data for the Tracked Mail Processing folder
-define('RSF_PID_TODO_SEARCH', 0x8004);         // Indicates that the structure contains data for the To-Do folder
-define('RSF_PID_CONV_ACTIONS', 0x8006);        // Indicates that the structure contains data for the Conversation Action Settings folder
-define('RSF_PID_COMBINED_ACTIONS', 0x8007);    // This value is reserved.
-define('RSF_PID_SUGGESTED_CONTACTS', 0x8008);  // Indicates that the structure contains data for the Suggested Contacts folder.
-define('RSF_PID_CONTACT_SEARCH', 0x8009);      // Indicates that the structure contains data for the Contacts Search folder.
-define('RSF_PID_BUDDYLIST_PDLS', 0x800A);      // Indicates that the structure contains data for the IM Contacts List folder.
-define('RSF_PID_BUDDYLIST_CONTACTS', 0x800B);  // Indicates that the structure contains data for the Quick Contacts folder.
+define('PERSIST_SENTINEL', 0x0000); // Indicates that the PersistData structure is the last one contained in the PidTagAdditionalRenEntryIdsEx property
+define('RSF_PID_RSS_SUBSCRIPTION', 0x8001); // Indicates that the structure contains data for the RSS Feeds folder
+define('RSF_PID_SEND_AND_TRACK', 0x8002); // Indicates that the structure contains data for the Tracked Mail Processing folder
+define('RSF_PID_TODO_SEARCH', 0x8004); // Indicates that the structure contains data for the To-Do folder
+define('RSF_PID_CONV_ACTIONS', 0x8006); // Indicates that the structure contains data for the Conversation Action Settings folder
+define('RSF_PID_COMBINED_ACTIONS', 0x8007); // This value is reserved.
+define('RSF_PID_SUGGESTED_CONTACTS', 0x8008); // Indicates that the structure contains data for the Suggested Contacts folder.
+define('RSF_PID_CONTACT_SEARCH', 0x8009); // Indicates that the structure contains data for the Contacts Search folder.
+define('RSF_PID_BUDDYLIST_PDLS', 0x800A); // Indicates that the structure contains data for the IM Contacts List folder.
+define('RSF_PID_BUDDYLIST_CONTACTS', 0x800B); // Indicates that the structure contains data for the Quick Contacts folder.
 
 /* PersistElementType Values ElementIDs for persist data of PR_ADDITIONAL_REN_ENTRYIDS_EX / PR_ADDITIONAL_REN_ENTRYIDS_EX */
-define('ELEMENT_SENTINEL', 0x0000);            // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure.
-define('RSF_ELID_ENTRYID', 0x0001);            // variable Indicates that the ElementData field contains the entry ID of the special folder that is of the type indicated by the value of the PersistID field of the PersistData structure.
-define('RSF_ELID_HEADER', 0x0002);             // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
+define('ELEMENT_SENTINEL', 0x0000); // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure.
+define('RSF_ELID_ENTRYID', 0x0001); // variable Indicates that the ElementData field contains the entry ID of the special folder that is of the type indicated by the value of the PersistID field of the PersistData structure.
+define('RSF_ELID_HEADER', 0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
 
 define('STGM_DIRECT', 0x00000000);
 define('STGM_TRANSACTED', 0x00010000);

mapi.util.php

Spacing +3 added lines, -3 removed lines

@@ -212,7 +212,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,
@@ -241,8 +241,8 @@ 
 						VALUE => true,
 					],
 				],
-			],	// EXISTS OR
-		];		// global OR
+			], // EXISTS OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

class.meetingrequest.php

Spacing +15 added lines, -15 removed lines

@@ -165,15 +165,15 @@ 
 		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:' . PidLidReminderDelta;
 		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:' . PidLidReminderSet;
 		$properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:' . PidLidAppointmentSequence;					// AppointmentSequenceNumber
+		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:' . PidLidAppointmentSequence; // AppointmentSequenceNumber
 		$properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
-		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';			// AppointmentLastSequence
+		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203'; // AppointmentLastSequence
 		$properties['busystatus'] = 'PT_LONG:PSETID_Appointment:' . PidLidBusyStatus;
 		$properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:' . PidLidIntendedBusyStatus;
 		$properties['start'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidAppointmentStartWhole;
 		$properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
 		$properties['location'] = 'PT_STRING8:PSETID_Appointment:' . PidLidLocation;
-		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';		// PidLidFInvited, MeetingRequestWasSent
+		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229'; // PidLidFInvited, MeetingRequestWasSent
 		$properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidAppointmentStartWhole;
 		$properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidAppointmentEndWhole;
 		$properties['flagdueby'] = 'PT_SYSTIME:PSETID_Common:' . PidLidReminderSignalTime;
@@ -182,11 +182,11 @@ 
 		$properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:' . PidLidRecurring;
 		$properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidClipStart;
 		$properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidClipEnd;
-		$properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD';				// StartRecurTime
-		$properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE';				// StartRecurTime
-		$properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF';				// EndRecurDate
-		$properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10';				// EndRecurTime
-		$properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA';				// LID_IS_EXCEPTION
+		$properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD'; // StartRecurTime
+		$properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE'; // StartRecurTime
+		$properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF'; // EndRecurDate
+		$properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10'; // EndRecurTime
+		$properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA'; // LID_IS_EXCEPTION
 		$properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
 		// Propose new time properties
 		$properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:' . PidLidAppointmentProposedStartWhole;
@@ -563,7 +563,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;
 		}
@@ -1507,7 +1507,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;
 		}
 
@@ -2522,7 +2522,7 @@ 
 		$getResourcesRestriction = [
 			RES_PROPERTY,
 			[
-				RELOP => RELOP_EQ,	// Equals recipient type 3: Resource
+				RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 				ULPROPTAG => PR_RECIPIENT_TYPE,
 				VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 			],
@@ -2798,7 +2798,7 @@ 
 		$getResourcesRestriction = [
 			RES_PROPERTY,
 			[
-				RELOP => RELOP_EQ,	// Equals recipient type 3: Resource
+				RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 				ULPROPTAG => PR_RECIPIENT_TYPE,
 				VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 			],
@@ -3016,7 +3016,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],
 					],
@@ -3119,7 +3119,7 @@ 
 			$stripResourcesRestriction[1][] = [
 				RES_PROPERTY,
 				[
-					RELOP => RELOP_NE,	// Does not equal recipient type: MAPI_BCC (Resource)
+					RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
 					ULPROPTAG => PR_RECIPIENT_TYPE,
 					VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 				],
@@ -3225,7 +3225,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];
 			}

class.baserecurrence.php

Spacing +2 added lines, -2 removed lines

@@ -1404,7 +1404,7 @@ 
 			if ($this->tz["timezone"] != 0) {
 				// Create user readable timezone information
 				$timezone = sprintf(
-					"(GMT %s%02d:%02d)",-
+					"(GMT %s%02d:%02d)", -
 					$this->tz["timezone"] > 0 ? "+" : "-",
 					abs($this->tz["timezone"] / 60),
 					abs($this->tz["timezone"] % 60)
@@ -1942,7 +1942,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) {

dev/generate_php-mapi-stub.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 
 		// Filter the relevant constants
 		$relevant_prefixes = ['PR_', 'PidLid', 'MAPI', 'ec', 'RPC_', 'SYNC_'];
-		$relevant_constants = array_filter($constants, function ($key) use ($relevant_prefixes) {
+		$relevant_constants = array_filter($constants, function($key) use ($relevant_prefixes) {
 			foreach ($relevant_prefixes as $prefix) {
 				if (strpos($key, $prefix) === 0) {
 					return true;

dev/php-mapi-stub.php

Spacing +60 added lines, -60 removed lines

@@ -11,7 +11,7 @@ 
  * @return void
  */
 function mapi_load_mapidefs(?int $level): void {
-	return ;
+	return;
 }
 
 /**
@@ -25,7 +25,7 @@ 
  * @param int $proptag
  * @return int|bool
  */
-function mapi_prop_type(int $proptag): int|bool {
+function mapi_prop_type(int $proptag): int | bool {
 	return 0;
 }
 
@@ -33,7 +33,7 @@ 
  * @param int $proptag
  * @return int|bool
  */
-function mapi_prop_id(int $proptag): int|bool {
+function mapi_prop_id(int $proptag): int | bool {
 	return 0;
 }
 
@@ -50,7 +50,7 @@ 
  * @param int $code
  * @return int|bool
  */
-function mapi_make_scode(int $sev, int $code): int|bool {
+function mapi_make_scode(int $sev, int $code): int | bool {
 	return 0;
 }
 
@@ -59,7 +59,7 @@ 
  * @param int $propid
  * @return int|bool
  */
-function mapi_prop_tag(int $proptype, int $propid): int|bool {
+function mapi_prop_tag(int $proptype, int $propid): int | bool {
 	return 0;
 }
 
@@ -70,7 +70,7 @@ 
  * @param ?int $flags
  * @return string|bool
  */
-function mapi_createoneoff(?string $displayname, string $type, string $address, ?int $flags = 0): string|bool {
+function mapi_createoneoff(?string $displayname, string $type, string $address, ?int $flags = 0): string | bool {
 	return '';
 }
 
@@ -78,7 +78,7 @@ 
  * @param string $entryid
  * @return array|bool
  */
-function mapi_parseoneoff(string $entryid): array|bool {
+function mapi_parseoneoff(string $entryid): array | bool {
 	return [];
 }
 
@@ -93,7 +93,7 @@ 
  * @param ?string $misc_version
  * @return resource|bool
  */
-function mapi_logon_zarafa(string $username, string $password, ?string $server = null, ?string $sslcert = null, ?string $sslpass = null, ?int $flags = 0, ?string $wa_version = null, ?string $misc_version = null): resource|bool {
+function mapi_logon_zarafa(string $username, string $password, ?string $server = null, ?string $sslcert = null, ?string $sslpass = null, ?int $flags = 0, ?string $wa_version = null, ?string $misc_version = null): resource | bool {
 	return new resource();
 }
 
@@ -103,7 +103,7 @@ 
  * @param int $flags
  * @return resource|bool
  */
-function mapi_logon_ex(string $username, string $password, int $flags): resource|bool {
+function mapi_logon_ex(string $username, string $password, int $flags): resource | bool {
 	return new resource();
 }
 
@@ -111,7 +111,7 @@ 
  * @param string $token
  * @return resource|bool
  */
-function mapi_logon_token(string $token): resource|bool {
+function mapi_logon_token(string $token): resource | bool {
 	return new resource();
 }
 
@@ -119,7 +119,7 @@ 
  * @param resource $session
  * @return resource|bool
  */
-function mapi_getmsgstorestable(resource $session): resource|bool {
+function mapi_getmsgstorestable(resource $session): resource | bool {
 	return new resource();
 }
 
@@ -128,7 +128,7 @@ 
  * @param string $entryid
  * @return resource|bool
  */
-function mapi_openmsgstore(resource $ses, string $entryid): resource|bool {
+function mapi_openmsgstore(resource $ses, string $entryid): resource | bool {
 	return new resource();
 }
 
@@ -137,7 +137,7 @@ 
  * @param string $uid
  * @return resource|bool
  */
-function mapi_openprofilesection(resource $ses, string $uid): resource|bool {
+function mapi_openprofilesection(resource $ses, string $uid): resource | bool {
 	return new resource();
 }
 
@@ -145,7 +145,7 @@ 
  * @param resource $session
  * @return resource|bool
  */
-function mapi_openaddressbook(resource $session): resource|bool {
+function mapi_openaddressbook(resource $session): resource | bool {
 	return new resource();
 }
 
@@ -155,7 +155,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_openentry(resource $ses, ?string $entryid = null, ?int $flags = 0): resource|bool {
+function mapi_openentry(resource $ses, ?string $entryid = null, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -165,7 +165,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_ab_openentry(resource $abk, ?string $entryid = null, ?int $flags = 0): resource|bool {
+function mapi_ab_openentry(resource $abk, ?string $entryid = null, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -183,7 +183,7 @@ 
  * @param resource $abk
  * @return string|bool
  */
-function mapi_ab_getdefaultdir(resource $abk): string|bool {
+function mapi_ab_getdefaultdir(resource $abk): string | bool {
 	return '';
 }
 
@@ -192,7 +192,7 @@ 
  * @param string $mailbox_dn
  * @return string|bool
  */
-function mapi_msgstore_createentryid(resource $store, string $mailbox_dn): string|bool {
+function mapi_msgstore_createentryid(resource $store, string $mailbox_dn): string | bool {
 	return '';
 }
 
@@ -212,7 +212,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_msgstore_openentry(resource $store, ?string $entryid = null, ?int $flags = 0): resource|bool {
+function mapi_msgstore_openentry(resource $store, ?string $entryid = null, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -220,7 +220,7 @@ 
  * @param resource $store
  * @return resource|bool
  */
-function mapi_msgstore_getreceivefolder(resource $store): resource|bool {
+function mapi_msgstore_getreceivefolder(resource $store): resource | bool {
 	return new resource();
 }
 
@@ -230,7 +230,7 @@ 
  * @param ?string $sk_msg
  * @return string|bool
  */
-function mapi_msgstore_entryidfromsourcekey(resource $store, string $sk_fld, ?string $sk_msg = null): string|bool {
+function mapi_msgstore_entryidfromsourcekey(resource $store, string $sk_fld, ?string $sk_msg = null): string | bool {
 	return '';
 }
 
@@ -241,7 +241,7 @@ 
  * @param resource $sink
  * @return int|bool
  */
-function mapi_msgstore_advise(resource $store, string $entryid, int $event_mask, resource $sink): int|bool {
+function mapi_msgstore_advise(resource $store, string $entryid, int $event_mask, resource $sink): int | bool {
 	return 0;
 }
 
@@ -266,7 +266,7 @@ 
 /**
  * @return resource|bool
  */
-function mapi_sink_create(): resource|bool {
+function mapi_sink_create(): resource | bool {
 	return new resource();
 }
 
@@ -304,7 +304,7 @@ 
  * @param resource $table
  * @return int|bool
  */
-function mapi_table_getrowcount(resource $table): int|bool {
+function mapi_table_getrowcount(resource $table): int | bool {
 	return 0;
 }
 
@@ -324,7 +324,7 @@ 
  * @param int $rowcount
  * @return int|bool
  */
-function mapi_table_seekrow(resource $table, int $bookmark, int $rowcount): int|bool {
+function mapi_table_seekrow(resource $table, int $bookmark, int $rowcount): int | bool {
 	return 0;
 }
 
@@ -355,7 +355,7 @@ 
  * @param ?int $flags
  * @return int|bool
  */
-function mapi_table_findrow(resource $table, array $restrict, ?int $bookmark = 0, ?int $flags = 0): int|bool {
+function mapi_table_findrow(resource $table, array $restrict, ?int $bookmark = 0, ?int $flags = 0): int | bool {
 	return 0;
 }
 
@@ -363,7 +363,7 @@ 
  * @param resource $table
  * @return int|bool
  */
-function mapi_table_createbookmark(resource $table): int|bool {
+function mapi_table_createbookmark(resource $table): int | bool {
 	return 0;
 }
 
@@ -381,7 +381,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_folder_gethierarchytable(resource $fld, ?int $flags = 0): resource|bool {
+function mapi_folder_gethierarchytable(resource $fld, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -390,7 +390,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_folder_getcontentstable(resource $fld, ?int $flags = 0): resource|bool {
+function mapi_folder_getcontentstable(resource $fld, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -398,7 +398,7 @@ 
  * @param resource $fld
  * @return resource|bool
  */
-function mapi_folder_getrulestable(resource $fld): resource|bool {
+function mapi_folder_getrulestable(resource $fld): resource | bool {
 	return new resource();
 }
 
@@ -407,7 +407,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_folder_createmessage(resource $fld, ?int $flags = 0): resource|bool {
+function mapi_folder_createmessage(resource $fld, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -419,7 +419,7 @@ 
  * @param ?int $folder_type
  * @return resource|bool
  */
-function mapi_folder_createfolder(resource $fld, string $fname, ?string $comment = null, ?int $flags = 0, ?int $folder_type = 0): resource|bool {
+function mapi_folder_createfolder(resource $fld, string $fname, ?string $comment = null, ?int $flags = 0, ?int $folder_type = 0): resource | bool {
 	return new resource();
 }
 
@@ -519,7 +519,7 @@ 
  * @param resource $msg
  * @return resource|bool
  */
-function mapi_message_getattachmenttable(resource $msg): resource|bool {
+function mapi_message_getattachmenttable(resource $msg): resource | bool {
 	return new resource();
 }
 
@@ -527,7 +527,7 @@ 
  * @param resource $msg
  * @return resource|bool
  */
-function mapi_message_getrecipienttable(resource $msg): resource|bool {
+function mapi_message_getrecipienttable(resource $msg): resource | bool {
 	return new resource();
 }
 
@@ -536,7 +536,7 @@ 
  * @param int $id
  * @return resource|bool
  */
-function mapi_message_openattach(resource $msg, int $id): resource|bool {
+function mapi_message_openattach(resource $msg, int $id): resource | bool {
 	return new resource();
 }
 
@@ -545,7 +545,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_message_createattach(resource $msg, ?int $flags = 0): resource|bool {
+function mapi_message_createattach(resource $msg, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -593,7 +593,7 @@ 
  * @param ?string $guid
  * @return resource|bool
  */
-function mapi_openpropertytostream(resource $any, int $proptag, ?int $flags = 0, ?string $guid = null): resource|bool {
+function mapi_openpropertytostream(resource $any, int $proptag, ?int $flags = 0, ?string $guid = null): resource | bool {
 	return new resource();
 }
 
@@ -602,7 +602,7 @@ 
  * @param string $data
  * @return int|bool
  */
-function mapi_stream_write(resource $stream, string $data): int|bool {
+function mapi_stream_write(resource $stream, string $data): int | bool {
 	return 0;
 }
 
@@ -611,7 +611,7 @@ 
  * @param int $size
  * @return string|bool
  */
-function mapi_stream_read(resource $stream, int $size): string|bool {
+function mapi_stream_read(resource $stream, int $size): string | bool {
 	return '';
 }
 
@@ -619,7 +619,7 @@ 
  * @param resource $stream
  * @return array|bool
  */
-function mapi_stream_stat(resource $stream): array|bool {
+function mapi_stream_stat(resource $stream): array | bool {
 	return [];
 }
 
@@ -653,7 +653,7 @@ 
 /**
  * @return resource|bool
  */
-function mapi_stream_create(): resource|bool {
+function mapi_stream_create(): resource | bool {
 	return new resource();
 }
 
@@ -662,7 +662,7 @@ 
  * @param ?int $flags
  * @return resource|bool
  */
-function mapi_attach_openobj(resource $attach, ?int $flags = 0): resource|bool {
+function mapi_attach_openobj(resource $attach, ?int $flags = 0): resource | bool {
 	return new resource();
 }
 
@@ -710,7 +710,7 @@ 
  * @param int $proptag
  * @return resource|bool
  */
-function mapi_openproperty(resource $any, int $proptag /* [more] */): resource|bool {
+function mapi_openproperty(resource $any, int $proptag /* [more] */): resource | bool {
 	return new resource();
 }
 
@@ -728,7 +728,7 @@ 
  * @param ?array $names
  * @return array|bool
  */
-function mapi_getnamesfromids(resource $any, ?array $names = null): array|bool {
+function mapi_getnamesfromids(resource $any, ?array $names = null): array | bool {
 	return [];
 }
 
@@ -738,7 +738,7 @@ 
  * @param ?array $guids
  * @return array|bool
  */
-function mapi_getidsfromnames(resource $store, array $names, ?array $guids = null): array|bool {
+function mapi_getidsfromnames(resource $store, array $names, ?array $guids = null): array | bool {
 	return [];
 }
 
@@ -746,7 +746,7 @@ 
  * @param string $data
  * @return string|bool
  */
-function mapi_decompressrtf(string $data): string|bool {
+function mapi_decompressrtf(string $data): string | bool {
 	return '';
 }
 
@@ -755,7 +755,7 @@ 
  * @param int $type
  * @return array|bool
  */
-function mapi_zarafa_getpermissionrules(resource $any, int $type): array|bool {
+function mapi_zarafa_getpermissionrules(resource $any, int $type): array | bool {
 	return [];
 }
 
@@ -775,7 +775,7 @@ 
  * @param int $end
  * @return array|bool
  */
-function mapi_getuserfreebusy(resource $ses, string $entryid, int $start, int $end): array|bool {
+function mapi_getuserfreebusy(resource $ses, string $entryid, int $start, int $end): array | bool {
 	return [];
 }
 
@@ -786,7 +786,7 @@ 
  * @param int $end
  * @return string|bool
  */
-function mapi_getuserfreebusyical(resource $ses, string $entryid, int $start, int $end): string|bool {
+function mapi_getuserfreebusyical(resource $ses, string $entryid, int $start, int $end): string | bool {
 	return '';
 }
 
@@ -826,7 +826,7 @@ 
  * @param resource $r
  * @return int|bool
  */
-function mapi_exportchanges_getchangecount(resource $r): int|bool {
+function mapi_exportchanges_getchangecount(resource $r): int | bool {
 	return 0;
 }
 
@@ -934,7 +934,7 @@ 
  * @param object &$object
  * @return resource|bool
  */
-function mapi_wrap_importcontentschanges(object &$object): resource|bool {
+function mapi_wrap_importcontentschanges(object &$object): resource | bool {
 	return new resource();
 }
 
@@ -942,7 +942,7 @@ 
  * @param object &$object
  * @return resource|bool
  */
-function mapi_wrap_importhierarchychanges(object &$object): resource|bool {
+function mapi_wrap_importhierarchychanges(object &$object): resource | bool {
 	return new resource();
 }
 
@@ -953,7 +953,7 @@ 
  * @param array $opts
  * @return resource|bool
  */
-function mapi_inetmapi_imtoinet(resource $ses, resource $abk, resource $msg, array $opts): resource|bool {
+function mapi_inetmapi_imtoinet(resource $ses, resource $abk, resource $msg, array $opts): resource | bool {
 	return new resource();
 }
 
@@ -989,7 +989,7 @@ 
  * @param string $ics
  * @return array|bool
  */
-function mapi_icaltomapi2(resource $abk, resource $fld, string $ics): array|bool {
+function mapi_icaltomapi2(resource $abk, resource $fld, string $ics): array | bool {
 	return [];
 }
 
@@ -1000,7 +1000,7 @@ 
  * @param array $opts
  * @return string|bool
  */
-function mapi_mapitoical(resource $ses, resource $abk, resource $msg, array $opts): string|bool {
+function mapi_mapitoical(resource $ses, resource $abk, resource $msg, array $opts): string | bool {
 	return '';
 }
 
@@ -1020,7 +1020,7 @@ 
  * @param string $vcard
  * @return array|bool
  */
-function mapi_vcftomapi2(resource $fld, string $vcard): array|bool {
+function mapi_vcftomapi2(resource $fld, string $vcard): array | bool {
 	return [];
 }
 
@@ -1031,7 +1031,7 @@ 
  * @param array $opts
  * @return string|bool
  */
-function mapi_mapitovcf(resource $ses, resource $abk, resource $msg, array $opts): string|bool {
+function mapi_mapitovcf(resource $ses, resource $abk, resource $msg, array $opts): string | bool {
 	return '';
 }
 
@@ -1073,7 +1073,7 @@ 
  * @param string $username
  * @return array|bool
  */
-function nsp_getuserinfo(string $username): array|bool {
+function nsp_getuserinfo(string $username): array | bool {
 	return [];
 }
 
@@ -1091,7 +1091,7 @@ 
  * @param string $essdn
  * @return string|bool
  */
-function nsp_essdn_to_username(string $essdn): string|bool {
+function nsp_essdn_to_username(string $essdn): string | bool {
 	return '';
 }
 
@@ -1109,7 +1109,7 @@ 
  * @param string $tz
  * @return string|bool
  */
-function mapi_ianatz_to_tzdef(string $tz): string|bool {
+function mapi_ianatz_to_tzdef(string $tz): string | bool {
 	return '';
 }
 

class.recurrence.php

Spacing +13 added lines, -25 removed lines

@@ -652,11 +652,8 @@ 
 	public function getOccDate(bool $getStart = true): mixed {
 		return $getStart ?
 			(isset($this->recur['startocc']) ?
-				$this->recur['start'] + (((int) $this->recur['startocc']) * 60) :
-				$this->recur['start']) :
-			(isset($this->recur['endocc']) ?
-				$this->recur['start'] + (((int) $this->recur['endocc']) * 60) :
-				$this->recur['end']);
+				$this->recur['start'] + (((int) $this->recur['startocc']) * 60) : $this->recur['start']) : (isset($this->recur['endocc']) ?
+				$this->recur['start'] + (((int) $this->recur['endocc']) * 60) : $this->recur['end']);
 	}
 
 	/**
@@ -689,8 +686,7 @@ 
 						$end,
 						$startocc,
 						$endocc
-					) :
-					sprintf(
+					) : sprintf(
 						dgettext('zarafa', 'Occurs every %s %s effective %s until %s from %s to %s.'),
 						$interval,
 						$type,
@@ -699,16 +695,14 @@ 
 						$startocc,
 						$endocc
 					)
-			) :
-			(
+			) : (
 				$occSingleDayRank ?
 					sprintf(
 						dgettext('zarafa', 'Occurs every %s effective %s until %s.'),
 						$type,
 						$start,
 						$end
-					) :
-					sprintf(
+					) : sprintf(
 						dgettext('zarafa', 'Occurs every %s %s effective %s until %s.'),
 						$interval,
 						$type,
@@ -747,8 +741,7 @@ 
 						$numocc,
 						$startocc,
 						$endocc
-					) :
-					sprintf(
+					) : sprintf(
 						dngettext(
 							'zarafa',
 							'Occurs every %s %s effective %s for %s occurrence from %s to %s.',
@@ -762,8 +755,7 @@ 
 						$startocc,
 						$endocc
 					)
-			) :
-			(
+			) : (
 				$occSingleDayRank ?
 					sprintf(
 						dngettext(
@@ -775,8 +767,7 @@ 
 						$type,
 						$start,
 						$numocc
-					) :
-					sprintf(
+					) : sprintf(
 						dngettext(
 							'zarafa',
 							'Occurs every %s %s effective %s for %s occurrence.',
@@ -812,8 +803,7 @@ 
 						$start,
 						$startocc,
 						$endocc
-					) :
-					sprintf(
+					) : sprintf(
 						dgettext('zarafa', 'Occurs every %s %s effective %s from %s to %s.'),
 						$interval,
 						$type,
@@ -821,15 +811,13 @@ 
 						$startocc,
 						$endocc
 					)
-			) :
-			(
+			) : (
 				$occSingleDayRank ?
 					sprintf(
 						dgettext('zarafa', 'Occurs every %s effective %s.'),
 						$type,
 						$start
-					) :
-					sprintf(
+					) : sprintf(
 						dgettext('zarafa', 'Occurs every %s %s effective %s.'),
 						$interval,
 						$type,
@@ -1309,7 +1297,7 @@ 
 				else {
 					$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 				}
-				$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
+				$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
 			}
 			unset($recip);
 			mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1384,7 +1372,7 @@ 
 						else {
 							$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 						}
-						$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
+						$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
 						$deletedRecipients[] = $recipient;
 					}
 				}