grommunio / grommunio-dav

mapi/mapi.util.php

Spacing +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
 		// OR
 		[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,
 							[RELOP => RELOP_GT,
@@ -247,7 +247,7 @@ 
 					],
 				],
 			], // EXISTS OR
-		];        // global OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

mapi/mapidefs.php

Spacing +96 added lines, -96 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('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 */
@@ -61,18 +61,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 */
@@ -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_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);
@@ -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 ------------------------------------------------------- */
 
@@ -438,28 +438,28 @@ 
 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
 
 /* GUIDs for PR_MDB_PROVIDER */
-define("KOPANO_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}"));    // default store
-define("KOPANO_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}"));    // public store
-define("KOPANO_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}"));    // other store
-define("KOPANO_STORE_ARCHIVER_GUID", makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
+define("KOPANO_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}")); // default store
+define("KOPANO_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}")); // public store
+define("KOPANO_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}")); // other store
+define("KOPANO_STORE_ARCHIVER_GUID", makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}")); // archive store
 /* webapp depends on these yet */
-define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}"));    // default store
-define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}"));    // public store
-define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}"));    // other store
-define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
+define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}")); // default store
+define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}")); // public store
+define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}")); // 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}"));
@@ -487,10 +487,10 @@ 
 // define('ecrightsContact'                       ,0x00000200);
 define('ecRightsFolderVisible', 0x00000400);
 
-define('ecRightsAll', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderAccess | ecRightsFolderVisible);
-define('ecRightsFullControl', ecRightsReadAny | ecRightsCreate | ecRightsEditOwned | ecRightsDeleteOwned | ecRightsEditAny | ecRightsDeleteAny | ecRightsCreateSubfolder | ecRightsFolderVisible);
-define('ecRightsDefault', ecRightsNone | ecRightsFolderVisible);
-define('ecRightsDefaultPublic', ecRightsReadAny | ecRightsFolderVisible);
+define('ecRightsAll', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderAccess|ecRightsFolderVisible);
+define('ecRightsFullControl', ecRightsReadAny|ecRightsCreate|ecRightsEditOwned|ecRightsDeleteOwned|ecRightsEditAny|ecRightsDeleteAny|ecRightsCreateSubfolder|ecRightsFolderVisible);
+define('ecRightsDefault', ecRightsNone|ecRightsFolderVisible);
+define('ecRightsDefaultPublic', ecRightsReadAny|ecRightsFolderVisible);
 define('ecRightsAdmin', 0x00001000);
 define('ecRightsAllMask', 0x000015FB);
 
@@ -506,7 +506,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);
@@ -576,11 +576,11 @@ 
 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
@@ -591,23 +591,23 @@ 
 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);

mapi/class.mapiexception.php

Switch Indentation +25 added lines, -25 removed lines

@@ -25,37 +25,37 @@
 			}
 
 			switch ($this->getCode()) {
-			case MAPI_E_NO_ACCESS:
-				return dgettext("kopano", "You have insufficient privileges to open this object.");
+				case MAPI_E_NO_ACCESS:
+					return dgettext("kopano", "You have insufficient privileges to open this object.");
 
-			case MAPI_E_LOGON_FAILED:
-			case MAPI_E_UNCONFIGURED:
-				return dgettext("kopano", "Logon Failed. Please check your username/password.");
+				case MAPI_E_LOGON_FAILED:
+				case MAPI_E_UNCONFIGURED:
+					return dgettext("kopano", "Logon Failed. Please check your username/password.");
 
-			case MAPI_E_NETWORK_ERROR:
-				return dgettext("kopano", "Can not connect to Kopano server.");
+				case MAPI_E_NETWORK_ERROR:
+					return dgettext("kopano", "Can not connect to Kopano server.");
 
-			case MAPI_E_UNKNOWN_ENTRYID:
-				return dgettext("kopano", "Can not open object with provided id.");
+				case MAPI_E_UNKNOWN_ENTRYID:
+					return dgettext("kopano", "Can not open object with provided id.");
 
-			case MAPI_E_NO_RECIPIENTS:
-				return dgettext("kopano", "There are no recipients in the message.");
+				case MAPI_E_NO_RECIPIENTS:
+					return dgettext("kopano", "There are no recipients in the message.");
 
-			case MAPI_E_NOT_FOUND:
-				return dgettext("kopano", "Can not find object.");
+				case MAPI_E_NOT_FOUND:
+					return dgettext("kopano", "Can not find object.");
 
-			case MAPI_E_INTERFACE_NOT_SUPPORTED:
-			case MAPI_E_INVALID_PARAMETER:
-			case MAPI_E_INVALID_ENTRYID:
-			case MAPI_E_INVALID_OBJECT:
-			case MAPI_E_TOO_COMPLEX:
-			case MAPI_E_CORRUPT_DATA:
-			case MAPI_E_END_OF_SESSION:
-			case MAPI_E_AMBIGUOUS_RECIP:
-			case MAPI_E_COLLISION:
-			case MAPI_E_UNCONFIGURED:
-			default:
-				return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
+				case MAPI_E_INTERFACE_NOT_SUPPORTED:
+				case MAPI_E_INVALID_PARAMETER:
+				case MAPI_E_INVALID_ENTRYID:
+				case MAPI_E_INVALID_OBJECT:
+				case MAPI_E_TOO_COMPLEX:
+				case MAPI_E_CORRUPT_DATA:
+				case MAPI_E_END_OF_SESSION:
+				case MAPI_E_AMBIGUOUS_RECIP:
+				case MAPI_E_COLLISION:
+				case MAPI_E_UNCONFIGURED:
+				default:
+					return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
 			}
 		}
 	}

mapi/class.taskrequest.php

Spacing +37 added lines, -37 removed lines

@@ -22,12 +22,12 @@ 
 	* It is used to indicate the type of change that is being 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.
 	*
@@ -35,20 +35,20 @@ 
 	* at the top of the task request in 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 delegationstate is used for the assigner to indicate state
 	*/
@@ -60,14 +60,14 @@ 
 	/* 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
 
 	class TaskRequest {
 		// All recipient properties
@@ -265,13 +265,13 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['taskglobalobjid'] => $taskid, /* our new taskglobalobjid */
-				$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['delegationstate'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,	/* Task has been assigned */
-				PR_ICON_INDEX => 1283,						/* Task request icon */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
+				PR_ICON_INDEX => 1283, /* Task request icon */
 			]);
 			$this->setLastUser();
 			$this->setOwnerForAssignor();
@@ -284,17 +284,17 @@ 
 
 			// 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'] => tdsOWNNEW, 	/* for the recipient the task is new */
-				$this->props['taskmode'] => tdmtTaskReq,	/* for the recipient, it is a request */
-				$this->props['updatecount'] => 1,			/* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWNNEW, /* for the recipient the task is new */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient, it is a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => 0xFFFFFFFF,				/* show assigned icon */
+				PR_ICON_INDEX => 0xFFFFFFFF, /* show assigned icon */
 			]);
 
 			// Set Body
 			$body = $this->getBody();
-			$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($body));
 			mapi_stream_write($stream, $body);
 			mapi_stream_commit($stream);
@@ -302,7 +302,7 @@ 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, 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_savechanges($sub);
@@ -404,7 +404,7 @@ 
 			$this->updateTaskRequest();
 
 			// Set as accepted
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true,  $this->props['delegationstate'] => olTaskNotDelegated]);
+			mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true, $this->props['delegationstate'] => olTaskNotDelegated]);
 
 			mapi_savechanges($this->message);
 
@@ -433,7 +433,7 @@ 
 			$this->updateTaskRequest();
 
 			// Set as declined
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined,  $this->props['delegationstate'] => olTaskDelegationDeclined]);
+			mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined, $this->props['delegationstate'] => olTaskDelegationDeclined]);
 
 			mapi_savechanges($this->message);
 
@@ -475,7 +475,7 @@ 
 
 				$this->setRecipientsForResponse($outgoing, tdmtTaskUpd, true);
 				$body = $this->getBody();
-				$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($body));
 				mapi_stream_write($stream, $body);
 				mapi_stream_commit($stream);
@@ -600,7 +600,7 @@ 
 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], 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);
 
 			mapi_copyto($this->message, [], [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_SEARCH_KEY], $outgoing);
 			mapi_copyto($this->message, [], [], $sub);
@@ -628,7 +628,7 @@ 
 
 			// Set Body
 			$body = $this->getBody();
-			$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($body));
 			mapi_stream_write($stream, $body);
 			mapi_stream_commit($stream);
@@ -867,7 +867,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]);
 				}
 

mapi/class.baserecurrence.php

Switch Indentation +618 added lines, -618 removed lines

@@ -156,94 +156,94 @@ 
 			$rdata = substr($rdata, 10);
 
 			switch ($data["rtype"]) {
-			case 0x0A:
-				// Daily
-				if (strlen($rdata) < 12) {
-					return $ret;
-				}
-				$data = unpack("Vunknown/Veveryn/Vregen", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
+				case 0x0A:
+					// Daily
+					if (strlen($rdata) < 12) {
+						return $ret;
+					}
+					$data = unpack("Vunknown/Veveryn/Vregen", $rdata);
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
 
-				switch ($ret["subtype"]) {
-				case 0:
-					$rdata = substr($rdata, 12);
-					break;
+					switch ($ret["subtype"]) {
+						case 0:
+							$rdata = substr($rdata, 12);
+							break;
 
-				case 1:
-					$rdata = substr($rdata, 16);
-					break;
-				}
+						case 1:
+							$rdata = substr($rdata, 16);
+							break;
+					}
 				break;
 
-			case 0x0B:
-				// Weekly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0B:
+					// Weekly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vconst1/Veveryn/Vregen", $rdata);
-				$rdata = substr($rdata, 12);
+					$data = unpack("Vconst1/Veveryn/Vregen", $rdata);
+					$rdata = substr($rdata, 12);
 
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				$ret["weekdays"] = 0;
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					$ret["weekdays"] = 0;
 
-				if ($data["regen"] == 0) {
-					$data = unpack("Vweekdays", $rdata);
-					$rdata = substr($rdata, 4);
-					$ret["weekdays"] = $data["weekdays"];
-				}
-				break;
+					if ($data["regen"] == 0) {
+						$data = unpack("Vweekdays", $rdata);
+						$rdata = substr($rdata, 4);
+						$ret["weekdays"] = $data["weekdays"];
+					}
+					break;
 
-			case 0x0C:
-				// Monthly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0C:
+					// Monthly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
+					$data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					if ($ret["subtype"] == 3) {
+						$ret["weekdays"] = $data["monthday"];
+					}
+					else {
+						$ret["monthday"] = $data["monthday"];
+					}
 
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
+					$rdata = substr($rdata, 16);
+					if ($ret["subtype"] == 3) {
+						$data = unpack("Vnday", $rdata);
+						$ret["nday"] = $data["nday"];
+						$rdata = substr($rdata, 4);
+					}
+					break;
 
-			case 0x0D:
-				// Yearly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
+				case 0x0D:
+					// Yearly
+					if (strlen($rdata) < 16) {
+						return $ret;
+					}
 
-				$data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["month"] = $data["month"];
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
+					$data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
+					$ret["month"] = $data["month"];
+					$ret["everyn"] = $data["everyn"];
+					$ret["regen"] = $data["regen"];
+					if ($ret["subtype"] == 3) {
+						$ret["weekdays"] = $data["monthday"];
+					}
+					else {
+						$ret["monthday"] = $data["monthday"];
+					}
 
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
+					$rdata = substr($rdata, 16);
+					if ($ret["subtype"] == 3) {
+						$data = unpack("Vnday", $rdata);
+						$ret["nday"] = $data["nday"];
+						$rdata = substr($rdata, 4);
+					}
+					break;
 			}
 
 			if (strlen($rdata) < 16) {
@@ -573,312 +573,312 @@ 
 			$term = (int) $this->recur["type"];
 
 			switch ($term) {
-			case 0x0A:
-				// Daily
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-
-				if ($this->recur["subtype"] == 1) {
-					// Daily every workday
-					$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
-				}
-				else {
-					// Daily every N days (everyN in minutes)
-					$everyn = ((int) $this->recur["everyn"]) / 1440;
-					// Calc first occ
-					$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
-				}
-				break;
-
-			case 0x0B:
-				// Weekly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
-					return;
-				}
-
-				// No need to calculate startdate if sliding flag was set.
-				if (!$this->recur['regen']) {
-					// Calculate start date of recurrence
-
-					// Find the first day that matches one of the weekdays selected
-					$daycount = 0;
-					$dayskip = -1;
-					for ($j = 0; $j < 7; ++$j) {
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							if ($dayskip == -1) {
-								$dayskip = $j;
-							}
-							++$daycount;
-						}
+				case 0x0A:
+					// Daily
+					if (!isset($this->recur["everyn"])) {
+						return;
 					}
 
-					// $dayskip is the number of days to skip from the startdate until the first occurrence
-					// $daycount is the number of days per week that an occurrence occurs
-					$weekskip = 0;
-					if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
-						$weekskip = 1;
+					if ($this->recur["subtype"] == 1) {
+						// Daily every workday
+						$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
 					}
-
-					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-					// remaining occurrences based on the start of the recurrence.
-					if (((int) $this->recur["term"]) == 0x22) {
-						// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
-						// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
-						// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
-						// (eg when numoccur = 2, and daycount = 1)
-						$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
-
-						// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
-						// for the occurrence on the first day
-						$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
-
-						// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-						$forwardcount *= (int) $this->recur["everyn"];
+					else {
+						// Daily every N days (everyN in minutes)
+						$everyn = ((int) $this->recur["everyn"]) / 1440;
+						// Calc first occ
+						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
 					}
+					break;
 
-					// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-					$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
-				}
-
-				// Calc first occ
-				$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
-				$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
-
-				if ($this->recur["regen"]) {
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-				}
-				else {
-					$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
-				}
-				break;
-
-			case 0x0C:
-				// Monthly
-			case 0x0D:
-				// Yearly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
-					return;
-				}
-				if ($term == 0x0C /* monthly */) {
-					$everyn = (int) $this->recur["everyn"];
-				}
-				else {
-					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
-				}
-
-				// Get montday/month/year of original start
-				$curmonthday = gmdate("j", (int) $this->recur["start"]);
-				$curyear = gmdate("Y", (int) $this->recur["start"]);
-				$curmonth = gmdate("n", (int) $this->recur["start"]);
-
-				// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-				// remaining occurrences based on the start of the recurrence.
-				if (((int) $this->recur["term"]) == 0x22) {
-					// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
-					// one to make sure there are always at least one occurrence left)
-					$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
-				}
-
-				// Get month for yearly on D'th day of month M
-				if ($term == 0x0D /* yearly */) {
-					$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
-				} // 1=jan, 2=feb, eg
-
-				switch ((int) $this->recur["subtype"]) {
-				// on D day of every M month
-				case 2:
-					if (!isset($this->recur["monthday"])) {
+				case 0x0B:
+					// Weekly
+					if (!isset($this->recur["everyn"])) {
+						return;
+					}
+					if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
 						return;
 					}
-					// Recalc startdate
-					// Set on the right begin day
-					// Go the beginning of the month
-					$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
-					// Go the the correct month day
-					$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
-
-					// If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
-					if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-						($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
-						if ($term == 0x0D /* yearly */) {
-							$count = ($everyn - ($curmonth - $selmonth));
-						} // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
-						else {
-							$count = $everyn;
-						} // Monthly, go to next occurrence in 'everyn' months
-
-						// Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
-						for ($i = 0; $i < $count; ++$i) {
-							$this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
+
+					// No need to calculate startdate if sliding flag was set.
+					if (!$this->recur['regen']) {
+						// Calculate start date of recurrence
+
+						// Find the first day that matches one of the weekdays selected
+						$daycount = 0;
+						$dayskip = -1;
+						for ($j = 0; $j < 7; ++$j) {
+							if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+								if ($dayskip == -1) {
+									$dayskip = $j;
+								}
+								++$daycount;
 							}
-							++$curmonth;
 						}
-					}
 
-					// "start" is now pointing to the first occurrence, except that it will overshoot if the
-					// month in which it occurs has less days than specified as the day of the month. So 31st
-					// of each month will overshoot in february (29 days). We compensate for that by checking
-					// if the day of the month we got is wrong, and then back up to the last day of the previous
-					// month.
-					if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-						gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
-						$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
+						// $dayskip is the number of days to skip from the startdate until the first occurrence
+						// $daycount is the number of days per week that an occurrence occurs
+						$weekskip = 0;
+						if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
+							$weekskip = 1;
+						}
+
+						// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+						// remaining occurrences based on the start of the recurrence.
+						if (((int) $this->recur["term"]) == 0x22) {
+							// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
+							// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
+							// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
+							// (eg when numoccur = 2, and daycount = 1)
+							$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
+
+							// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
+							// for the occurrence on the first day
+							$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
+
+							// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
+							$forwardcount *= (int) $this->recur["everyn"];
+						}
+
+						// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
+						$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
 					}
 
-					// "start" is now the first occurrence
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+					// Calc first occ
+					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
+					$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
 
-						$firstocc = 0;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+					if ($this->recur["regen"]) {
+						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
 					}
 					else {
-						// Calc first occ
-						$firstocc = 0;
-						$monthIndex = (int) gmdate("n", $this->recur["start"]);
-						for ($i = 1; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+						$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
 					}
 					break;
 
-				case 3:
-					// monthly: on Nth weekday of every M month
-					// yearly: on Nth weekday of M month
-					if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
+				case 0x0C:
+					// Monthly
+				case 0x0D:
+					// Yearly
+					if (!isset($this->recur["everyn"])) {
 						return;
 					}
-
-					$weekdays = (int) $this->recur["weekdays"];
-					$nday = (int) $this->recur["nday"];
-
-					// Calc startdate
-					$monthbegindow = (int) $this->recur["start"];
-
-					if ($nday == 5) {
-						// Set date on the last day of the last month
-						$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+					if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
+						return;
+					}
+					if ($term == 0x0C /* monthly */) {
+						$everyn = (int) $this->recur["everyn"];
 					}
 					else {
-						// Set on the first day of the month
-						$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
+						$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+					}
+
+					// Get montday/month/year of original start
+					$curmonthday = gmdate("j", (int) $this->recur["start"]);
+					$curyear = gmdate("Y", (int) $this->recur["start"]);
+					$curmonth = gmdate("n", (int) $this->recur["start"]);
+
+					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+					// remaining occurrences based on the start of the recurrence.
+					if (((int) $this->recur["term"]) == 0x22) {
+						// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
+						// one to make sure there are always at least one occurrence left)
+						$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
 					}
 
+					// Get month for yearly on D'th day of month M
 					if ($term == 0x0D /* yearly */) {
-						// Set on right month
-						if ($selmonth < $curmonth) {
-							$tmp = 12 - $curmonth + $selmonth;
-						}
-						else {
-							$tmp = ($selmonth - $curmonth);
-						}
+						$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
+					} // 1=jan, 2=feb, eg
 
-						for ($i = 0; $i < $tmp; ++$i) {
-							$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
+					switch ((int) $this->recur["subtype"]) {
+					// on D day of every M month
+						case 2:
+							if (!isset($this->recur["monthday"])) {
+								return;
+							}
+							// Recalc startdate
+							// Set on the right begin day
+							// Go the beginning of the month
+							$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
+							// Go the the correct month day
+							$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
+
+							// If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
+							if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
+								($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
+								if ($term == 0x0D /* yearly */) {
+									$count = ($everyn - ($curmonth - $selmonth));
+								} // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
+								else {
+									$count = $everyn;
+								} // Monthly, go to next occurrence in 'everyn' months
+
+								// Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
+								for ($i = 0; $i < $count; ++$i) {
+									$this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
+									if ($curmonth == 12) {
+										++$curyear;
+										$curmonth = 0;
+									}
+									++$curmonth;
+								}
 							}
-							++$curmonth;
-						}
-					}
-					else {
-						// Check or you exist in the right month
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-								$day = gmdate("j", $monthbegindow) - $i;
 
-								break;
+							// "start" is now pointing to the first occurrence, except that it will overshoot if the
+							// month in which it occurs has less days than specified as the day of the month. So 31st
+							// of each month will overshoot in february (29 days). We compensate for that by checking
+							// if the day of the month we got is wrong, and then back up to the last day of the previous
+							// month.
+							if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+								gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
+								$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
 							}
-							if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-								$day = (($nday - 1) * 7) + ($i + 1);
 
-								break;
+							// "start" is now the first occurrence
+							if ($term == 0x0C /* monthly */) {
+								// Calc first occ
+								$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+
+								$firstocc = 0;
+								for ($i = 0; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+								}
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+							}
+							else {
+								// Calc first occ
+								$firstocc = 0;
+								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								for ($i = 1; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+								}
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+							}
+							break;
+
+						case 3:
+							// monthly: on Nth weekday of every M month
+							// yearly: on Nth weekday of M month
+							if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
+								return;
 							}
-						}
 
-						// Goto the next X month
-						if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+							$weekdays = (int) $this->recur["weekdays"];
+							$nday = (int) $this->recur["nday"];
+
+							// Calc startdate
+							$monthbegindow = (int) $this->recur["start"];
+
 							if ($nday == 5) {
-								$monthbegindow += 24 * 60 * 60;
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
-								}
-								++$curmonth;
+								// Set date on the last day of the last month
+								$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+							}
+							else {
+								// Set on the first day of the month
+								$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
 							}
 
-							for ($i = 0; $i < $everyn; ++$i) {
-								$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
+							if ($term == 0x0D /* yearly */) {
+								// Set on right month
+								if ($selmonth < $curmonth) {
+									$tmp = 12 - $curmonth + $selmonth;
+								}
+								else {
+									$tmp = ($selmonth - $curmonth);
+								}
+
+								for ($i = 0; $i < $tmp; ++$i) {
+									$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+									if ($curmonth == 12) {
+										++$curyear;
+										$curmonth = 0;
+									}
+									++$curmonth;
 								}
-								++$curmonth;
 							}
-							if ($nday == 5) {
-								$monthbegindow -= 24 * 60 * 60;
+							else {
+								// Check or you exist in the right month
+								for ($i = 0; $i < 7; ++$i) {
+									if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+										$day = gmdate("j", $monthbegindow) - $i;
+
+										break;
+									}
+									if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+										$day = (($nday - 1) * 7) + ($i + 1);
+
+										break;
+									}
+								}
+
+								// Goto the next X month
+								if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+									if ($nday == 5) {
+										$monthbegindow += 24 * 60 * 60;
+										if ($curmonth == 12) {
+											++$curyear;
+											$curmonth = 0;
+										}
+										++$curmonth;
+									}
+
+									for ($i = 0; $i < $everyn; ++$i) {
+										$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth == 12) {
+											++$curyear;
+											$curmonth = 0;
+										}
+										++$curmonth;
+									}
+									if ($nday == 5) {
+										$monthbegindow -= 24 * 60 * 60;
+									}
+								}
 							}
-						}
-					}
 
-					// FIXME: weekstart?
+							// FIXME: weekstart?
 
-					$day = 0;
-					// Set start on the right day
-					for ($i = 0; $i < 7; ++$i) {
-						if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-							$day = $i;
+							$day = 0;
+							// Set start on the right day
+							for ($i = 0; $i < 7; ++$i) {
+								if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+									$day = $i;
 
-							break;
-						}
-						if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-							$day = ($nday - 1) * 7 + ($i + 1);
+									break;
+								}
+								if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+									$day = ($nday - 1) * 7 + ($i + 1);
 
-							break;
-						}
-					}
-					if ($nday == 5) {
-						$monthbegindow -= $day * 24 * 60 * 60;
-					}
-					else {
-						$monthbegindow += ($day - 1) * 24 * 60 * 60;
-					}
+									break;
+								}
+							}
+							if ($nday == 5) {
+								$monthbegindow -= $day * 24 * 60 * 60;
+							}
+							else {
+								$monthbegindow += ($day - 1) * 24 * 60 * 60;
+							}
 
-					$firstocc = 0;
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-						break;
-					}
-					// Calc first occ
-					$monthIndex = (int) gmdate("n", $this->recur["start"]);
-					for ($i = 1; $i < $monthIndex; ++$i) {
-						$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+							$firstocc = 0;
+							if ($term == 0x0C /* monthly */) {
+								// Calc first occ
+								$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								for ($i = 0; $i < $monthIndex; ++$i) {
+									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+								}
+								$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+								break;
+							}
+							// Calc first occ
+							$monthIndex = (int) gmdate("n", $this->recur["start"]);
+							for ($i = 1; $i < $monthIndex; ++$i) {
+								$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+							}
+							$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+							break;
 					}
-					$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-					break;
-				}
 				break;
 			}
 
@@ -892,20 +892,20 @@ 
 
 			switch ($term) {
 			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", 10);
-				break;
-			// After a number of times
-			case 0x22:
-				if (!isset($this->recur["numoccur"])) {
-					return;
-				}
-				$rdata .= pack("V", (int) $this->recur["numoccur"]);
-				break;
-			// Never ends
-			case 0x23:
-				$rdata .= pack("V", 0);
-				break;
+				case 0x21:
+					$rdata .= pack("V", 10);
+					break;
+				// After a number of times
+				case 0x22:
+					if (!isset($this->recur["numoccur"])) {
+						return;
+					}
+					$rdata .= pack("V", (int) $this->recur["numoccur"]);
+					break;
+				// Never ends
+				case 0x23:
+					$rdata .= pack("V", 0);
+					break;
 			}
 
 			// Strange little thing for the recurrence type "every workday"
@@ -958,135 +958,135 @@ 
 			// Set enddate
 			switch ($term) {
 			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
-				break;
-			// After a number of times
-			case 0x22:
-				// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-				$occenddate = (int) $this->recur["start"];
-
-				switch ((int) $this->recur["type"]) {
-				case 0x0A: // daily
-					if ($this->recur["subtype"] != 1) {
-						// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-						$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
-						break;
-					}
-					// Daily every workday
-					$restocc = (int) $this->recur["numoccur"];
-					// Get starting weekday
-					$nowtime = $this->gmtime($occenddate);
-					$j = $nowtime["tm_wday"];
-
-					while (1) {
-						if (($j % 7) > 0 && ($j % 7) < 6) {
-							--$restocc;
-						}
-						++$j;
-						if ($restocc <= 0) {
-							break;
-						}
-						$occenddate += 24 * 60 * 60;
-					}
+				case 0x21:
+					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
 					break;
+				// After a number of times
+				case 0x22:
+					// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
+					$occenddate = (int) $this->recur["start"];
+
+					switch ((int) $this->recur["type"]) {
+						case 0x0A: // daily
+							if ($this->recur["subtype"] != 1) {
+								// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
+								$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
+								break;
+							}
+							// Daily every workday
+							$restocc = (int) $this->recur["numoccur"];
+							// Get starting weekday
+							$nowtime = $this->gmtime($occenddate);
+							$j = $nowtime["tm_wday"];
+
+							while (1) {
+								if (($j % 7) > 0 && ($j % 7) < 6) {
+									--$restocc;
+								}
+								++$j;
+								if ($restocc <= 0) {
+									break;
+								}
+								$occenddate += 24 * 60 * 60;
+							}
+							break;
 
-				case 0x0B: // weekly
-					// Needed values
-					// $forwardcount - number of weeks we can skip forward
-					// $restocc - number of remaining occurrences after the week skip
-
-					// Add the weeks till the last item
-					$occenddate += ($forwardcount * 7 * 24 * 60 * 60);
-					$dayofweek = gmdate("w", $occenddate);
-
-					// Loop through the last occurrences until we have had them all
-					for ($j = 1; $restocc > 0; ++$j) {
-						// Jump to the next week (which may be N weeks away) when going over the week boundary
-						if ((($dayofweek + $j) % 7) == $weekstart) {
-							$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
-						}
+						case 0x0B: // weekly
+							// Needed values
+							// $forwardcount - number of weeks we can skip forward
+							// $restocc - number of remaining occurrences after the week skip
 
-						// If this is a matching day, once less occurrence to process
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							--$restocc;
-						}
+							// Add the weeks till the last item
+							$occenddate += ($forwardcount * 7 * 24 * 60 * 60);
+							$dayofweek = gmdate("w", $occenddate);
 
-						// Next day
-						$occenddate += 24 * 60 * 60;
-					}
-					break;
+							// Loop through the last occurrences until we have had them all
+							for ($j = 1; $restocc > 0; ++$j) {
+								// Jump to the next week (which may be N weeks away) when going over the week boundary
+								if ((($dayofweek + $j) % 7) == $weekstart) {
+									$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
+								}
 
-				case 0x0C: // monthly
-				case 0x0D: // yearly
-					$curyear = gmdate("Y", (int) $this->recur["start"]);
-					$curmonth = gmdate("n", (int) $this->recur["start"]);
-					// $forwardcount = months
+								// If this is a matching day, once less occurrence to process
+								if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+									--$restocc;
+								}
 
-					switch ((int) $this->recur["subtype"]) {
-					case 2: // on D day of every M month
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
+								// Next day
+								$occenddate += 24 * 60 * 60;
 							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
+							break;
 
-						// compensation between 28 and 31
-						if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-							gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
-							if (gmdate("j", $occenddate) < 28) {
-								$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
-							}
-							else {
-								$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-							}
-						}
-						break;
+						case 0x0C: // monthly
+						case 0x0D: // yearly
+							$curyear = gmdate("Y", (int) $this->recur["start"]);
+							$curmonth = gmdate("n", (int) $this->recur["start"]);
+							// $forwardcount = months
+
+							switch ((int) $this->recur["subtype"]) {
+								case 2: // on D day of every M month
+									while ($forwardcount > 0) {
+										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth >= 12) {
+											$curmonth = 1;
+											++$curyear;
+										}
+										else {
+											++$curmonth;
+										}
+										--$forwardcount;
+									}
 
-					case 3: // on Nth weekday of every M month
-						$nday = (int) $this->recur["nday"]; // 1 tot 5
-						$weekdays = (int) $this->recur["weekdays"];
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
-							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
-						if ($nday == 5) {
-							// Set date on the last day of the last month
-							$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-						}
-						else {
-							// Set date on the first day of the last month
-							$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
-						}
+									// compensation between 28 and 31
+									if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+										gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
+										if (gmdate("j", $occenddate) < 28) {
+											$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
+										}
+										else {
+											$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+										}
+									}
+									break;
 
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
-								$occenddate -= $i * 24 * 60 * 60;
+								case 3: // on Nth weekday of every M month
+									$nday = (int) $this->recur["nday"]; // 1 tot 5
+									$weekdays = (int) $this->recur["weekdays"];
+									while ($forwardcount > 0) {
+										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+										if ($curmonth >= 12) {
+											$curmonth = 1;
+											++$curyear;
+										}
+										else {
+											++$curmonth;
+										}
+										--$forwardcount;
+									}
+									if ($nday == 5) {
+										// Set date on the last day of the last month
+										$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+									}
+									else {
+										// Set date on the first day of the last month
+										$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
+									}
 
-								break;
-							}
-							if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
-								$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
+									for ($i = 0; $i < 7; ++$i) {
+										if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
+											$occenddate -= $i * 24 * 60 * 60;
 
-								break;
+											break;
+										}
+										if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
+											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
+
+											break;
+										}
+									}
+									break; // case 3:
 							}
-						}
-						break; // case 3:
-					}
-					break;
+						break;
 				}
 
 				if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX) {
@@ -1097,11 +1097,11 @@ 
 				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
 				break;
 			// Never ends
-			case 0x23:
-			default:
-				$this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
-				$rdata .= pack("V", 0x5AE980DF);
-				break;
+				case 0x23:
+				default:
+					$this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
+					$rdata .= pack("V", 0x5AE980DF);
+					break;
 			}
 
 			// UTC date
@@ -1647,188 +1647,188 @@ 
 				// Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
 
 				switch ($this->recur["type"]) {
-				case 10:
-					// Daily
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1440;
-					}
+					case 10:
+						// Daily
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1440;
+						}
 
-					if ($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						if ($this->recur["subtype"] == 0) {
+							// Every Nth day
+							for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							break;
 						}
-						break;
-					}
-					// Every workday
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
-						$nowtime = $this->gmtime($now);
-						if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						// Every workday
+						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
+							$nowtime = $this->gmtime($now);
+							if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
 						}
-					}
-					break;
-
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						break;
 
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
+					case 11:
+						// Weekly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+						// If sliding flag is set then move to 'n' weeks
 						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-
-							break;
+							$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
 						}
-						// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-						for ($wday = 0; $wday < 7; ++$wday) {
-							$daynow = $now + $wday * 60 * 60 * 24;
-							// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-							if ($daynow > $dayend) {
-								continue;
-							}
-							$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-							if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
 
-				case 12:
-					// Monthly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+							if ($this->recur['regen']) {
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+								break;
 							}
-
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
+							for ($wday = 0; $wday < 7; ++$wday) {
+								$daynow = $now + $wday * 60 * 60 * 24;
+								// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+								if ($daynow > $dayend) {
+									continue;
+								}
+								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+								if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
-							// Sanitize input
-							if ($this->recur["weekdays"] == 0) {
-								$this->recur["weekdays"] = 1;
-							}
+						break;
 
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+					case 12:
+						// Monthly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										++$ndaycounter;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if ($this->recur["nday"] == $ndaycounter) {
-										$firstday = $day;
+						// Loop through all months from start to end of occurrence, starting at beginning of first month
+						for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+								$difference = 1;
+								if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+									$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+								}
 
-										break;
-									}
+								$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+								// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+								if ($daynow <= $dayend) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
 							}
-							else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth = $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+								// Sanitize input
+								if ($this->recur["weekdays"] == 0) {
+									$this->recur["weekdays"] = 1;
+								}
+
+								// If nday is not set to the last day in the month
+								if ($this->recur["nday"] < 5) {
+									// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+									$ndaycounter = 0;
+									// Find matching weekday in this month
+									for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
+										$daynow = $now + $day * 60 * 60 * 24;
+										$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+										if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+											++$ndaycounter;
+										}
+										// check the selected pattern is same as asked Nth weekday,If so set the firstday
+										if ($this->recur["nday"] == $ndaycounter) {
+											$firstday = $day;
+
+											break;
+										}
+									}
+									// $firstday is the day of the month on which the asked pattern of nth weekday matches
+									$daynow = $now + $firstday * 60 * 60 * 24;
+								}
+								else {
+									// Find last day in the month ($now is the firstday of the month)
+									$NumDaysInMonth = $this->daysInMonth($now, 1);
+									$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
 
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
-									$daynow -= 86400;
 									$nowtime = $this->gmtime($daynow);
+									while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
+										$daynow -= 86400;
+										$nowtime = $this->gmtime($daynow);
+									}
 								}
-							}
 
-							/*
+								/*
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the			* recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								if ($daynow <= $dayend && $daynow >= $daystart) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
-						}
-						elseif ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							elseif ($this->recur['regen']) {
+								$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+								$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+								if ($now <= $dayend) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
-					break;
-
-				case 13:
-					// Yearly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 12;
-					}
+						break;
 
-					for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if ($monthday > $this->daysInMonth($monthstart, 1)) {
-								$monthday = $this->daysInMonth($monthstart, 1);
-							}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+					case 13:
+						// Yearly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 12;
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
-							// Find first matching weekday in this month
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+						for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+								// recur["month"] is in minutes since the beginning of the year
+								$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+								$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+								$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+								if ($monthday > $this->daysInMonth($monthstart, 1)) {
+									$monthday = $this->daysInMonth($monthstart, 1);
+								}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
+								$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+								// Go the correct month
+								$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
-								if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
+								// Find first matching weekday in this month
+								for ($wday = 0; $wday < 7; ++$wday) {
+									$daynow = $monthnow + $wday * 60 * 60 * 24;
+									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
 
-									break;
+									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										$firstday = $wday;
+
+										break;
+									}
 								}
-							}
 
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
-							while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
+								// Same as above (monthly)
+								$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+								while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+									$daynow -= 7 * 60 * 60 * 24;
+								}
 
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$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) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif ($this->recur['regen']) {
+								$year_starttime = $this->gmtime($now);
+								$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) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
 				}
 				// to get all exception items
 				if (!empty($this->recur['changed_occurrences'])) {

Spacing +7 added lines, -7 removed lines

@@ -801,12 +801,12 @@ 
 					else {
 						// Check or you exist in the right month
 						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7))&$weekdays) {
 								$day = gmdate("j", $monthbegindow) - $i;
 
 								break;
 							}
-							if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+							if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7))&$weekdays) {
 								$day = (($nday - 1) * 7) + ($i + 1);
 
 								break;
@@ -843,12 +843,12 @@ 
 					$day = 0;
 					// Set start on the right day
 					for ($i = 0; $i < 7; ++$i) {
-						if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+						if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7))&$weekdays) {
 							$day = $i;
 
 							break;
 						}
-						if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+						if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7))&$weekdays) {
 							$day = ($nday - 1) * 7 + ($i + 1);
 
 							break;
@@ -1073,12 +1073,12 @@ 
 						}
 
 						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;
@@ -1822,7 +1822,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) {
 								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);

tests/grommunio-dav/GrommunioDavBackendTest.php

Spacing +4 added lines, -4 removed lines

@@ -62,10 +62,10 @@
 	 */
 	public function ObjectUriProvider() {
 		return [
-			['1234.ics', '.ics', '1234'],               // ok, cut .ics
-			['5678AF.vcf', '.vcf', '5678AF'],           // ok, cut .vcf
-			['123400.vcf', '.ics', '123400.vcf'],       // different extension, return as is
-			['1234.ics', '.vcf', '1234.ics'],            // different extension, return as is
+			['1234.ics', '.ics', '1234'], // ok, cut .ics
+			['5678AF.vcf', '.vcf', '5678AF'], // ok, cut .vcf
+			['123400.vcf', '.ics', '123400.vcf'], // different extension, return as is
+			['1234.ics', '.vcf', '1234.ics'], // different extension, return as is
 		];
 	}
 }

lib/GrommunioDavBackend.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
 		// TODO limit the output to subfolders of the principalUri?
 
 		$rootfolder = mapi_msgstore_openentry($this->GetStore($principalUri));
-		$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+		$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 		// TODO also filter hidden folders
 		$restrictions = [];
 		foreach ($classes as $class) {
@@ -653,7 +653,7 @@ 
 					],
 				], // EXISTS OR
 			],
-		];        // global OR
+		]; // global OR
 	}
 
 	/**
@@ -699,7 +699,7 @@ 
 		// the config. If there are more changes than MAX_SYNC_ITEMS the client will eventually catch up and sync
 		// the rest on the subsequent sync request(s).
 		$bufferSize = ($limit !== null && $limit > 0) ? $limit : MAX_SYNC_ITEMS;
-		mapi_exportchanges_config($exporter, $stream, SYNC_NORMAL | SYNC_UNICODE, $mapiimporter, null, false, false, $bufferSize);
+		mapi_exportchanges_config($exporter, $stream, SYNC_NORMAL|SYNC_UNICODE, $mapiimporter, null, false, false, $bufferSize);
 		$changesCount = mapi_exportchanges_getchangecount($exporter);
 		$this->logger->debug("Exporter found %d changes, buffer size for mapi_exportchanges_synchronize %d", $changesCount, $bufferSize);
 		while ((is_array(mapi_exportchanges_synchronize($exporter)))) {

mapi/class.taskrecurrence.php

Spacing +1 added lines, -1 removed lines

@@ -300,7 +300,7 @@
 
 			if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
 				$msgbody = $separator . $msgbody;
-				$stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($msgbody));
 				mapi_stream_write($stream, $msgbody);
 				mapi_stream_commit($stream);

mapi/class.recurrence.php

Spacing +12 added lines, -12 removed lines

@@ -725,7 +725,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);
@@ -1089,13 +1089,13 @@ 
 			// Remove all deleted recipients
 			if (isset($exception_recips['remove'])) {
 				foreach ($exception_recips['remove'] as &$recip) {
-					if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+					if (!isset($recipient[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']);
@@ -1165,13 +1165,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;
 						}
 					}
@@ -1230,12 +1230,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;
 				}
 			}
 
@@ -1249,7 +1249,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.