grommunio / grommunio-web

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -389,7 +389,7 @@ 
 				if ($data_orig_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_orig_strs[$i]['length'];
 					$orig_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgid'] = $orig_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgid'] = $orig_str['str']; // unpack converts to array :S
 
 					// Find context in the original string
 					if (strpos($translation_data[$i]['msgid'], "\004") !== false) {
@@ -416,7 +416,7 @@ 
 				if ($data_transl_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_transl_strs[$i]['length'];
 					$trans_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgstr'] = $trans_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgstr'] = $trans_str['str']; // unpack converts to array :S
 
 					// If there are plural forms in the source string,
 					// then the translated string must contain plural

server/includes/core/class.operations.php

Spacing +4 added lines, -4 removed lines

@@ -2192,9 +2192,9 @@ 
 			$messageProps = [];
 			// It stores the values that is exception allowed or not false -> not allowed
 			$isExceptionAllowed = true;
-			$delete = $actionType == 'delete';	// Flag for MeetingRequest Class whether to send update or cancel mail.
-			$basedate = false;	// Flag for MeetingRequest Class whether to send an exception or not.
-			$isReminderTimeAllowed = true;	// Flag to check reminder minutes is in range of the occurrences
+			$delete = $actionType == 'delete'; // Flag for MeetingRequest Class whether to send update or cancel mail.
+			$basedate = false; // Flag for MeetingRequest Class whether to send an exception or not.
+			$isReminderTimeAllowed = true; // Flag to check reminder minutes is in range of the occurrences
 			$properties = $GLOBALS['properties']->getAppointmentProperties();
 			$send = false;
 			$oldProps = [];
@@ -3115,7 +3115,7 @@ 
 				 * convert flags of PR_MESSAGE_FLAGS property to flags that is
 				 * used in mapi_message_setreadflag.
 				 */
-				$flag = MAPI_DEFERRED_ERRORS;		// set unread flag, read receipt will be sent
+				$flag = MAPI_DEFERRED_ERRORS; // set unread flag, read receipt will be sent
 
 				if (($flags & MSGFLAG_RN_PENDING) && isset($msg_action['send_read_receipt']) && $msg_action['send_read_receipt'] == false) {
 					$flag |= SUPPRESS_RECEIPT;

server/includes/core/class.entryid.php

Spacing +35 added lines, -36 removed lines

@@ -55,13 +55,13 @@ 
 			$entryId = strtoupper($entryid);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'uniqueId' => '',		// ULONG,    16 bytes,  32 hex characters
-				'server' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'uniqueId' => '', // ULONG,    16 bytes,  32 hex characters
+				'server' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -100,13 +100,13 @@ 
 			$entryId = strtoupper($entryid);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'id' => '',		// ULONG,     4 bytes,  8 hex characters
-				'server' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'id' => '', // ULONG,     4 bytes,  8 hex characters
+				'server' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -185,13 +185,13 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'abFlags' => '',		// BYTE[4],   4 bytes,  8 hex characters
-				'guid' => '',		// GUID,     16 bytes, 32 hex characters
-				'version' => '',		// ULONG,     4 bytes,  8 hex characters
-				'type' => '',		// ULONG,     4 bytes,  8 hex characters
-				'id' => '',		// ULONG,    16 bytes,  32 hex characters
-				'extid' => '',		// CHAR,     variable length
-				'padding' => '',		// TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
+				'abFlags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'guid' => '', // GUID,     16 bytes, 32 hex characters
+				'version' => '', // ULONG,     4 bytes,  8 hex characters
+				'type' => '', // ULONG,     4 bytes,  8 hex characters
+				'id' => '', // ULONG,    16 bytes,  32 hex characters
+				'extid' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -636,8 +636,7 @@ 
 				}
 			}
 			elseif ($checkValue !== null && $val != $checkValue) {
-				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() :
-						"<mapisession not yet initialized>";
+				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() : "<mapisession not yet initialized>";
 				error_log(sprintf(
 					"Unexpected value in store entryid for user %s. Entryid: %s key: '%s' value: '%s' expected: %s",
 					$user,
@@ -667,13 +666,13 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'messagetype' => '',			// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
-				'messagedbguid' => '',		// GUID,     16 bytes, 32 hex characters
-				'messagecounter' => '',	// ULONG,     6 bytes, 12 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagetype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
+				'messagedbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagecounter' => '', // ULONG,     6 bytes, 12 hex characters
 			];
 
 			if (!$entryId) {
@@ -733,12 +732,12 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'abflags' => '',					// BYTE[4],   4 bytes,  8 hex characters
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldertype' => '',				// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
+				'abflags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldertype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
 			];
 
 			if (!$entryId) {

server/includes/mapi/mapidefs.php

Spacing +77 added lines, -77 removed lines

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

server/includes/mapi/class.baserecurrence.php

Spacing +1 added lines, -1 removed lines

@@ -1896,7 +1896,7 @@
 						}
 						elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
+							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 
 							if ($now <= $dayend) {

server/includes/loader.php

Spacing +1 added lines, -1 removed lines

@@ -360,7 +360,7 @@
 			];
 			$fileDependencies[$filename] = [
 				'depends' => [],
-				'core' => $core,		// Based on tag or on class or on file path?
+				'core' => $core, // Based on tag or on class or on file path?
 			];
 
 			for ($j = 0, $lenJ = count($class[1]); $j < $lenJ; ++$j) {

server/includes/core/class.properties.php

Spacing +21 added lines, -21 removed lines

@@ -247,14 +247,14 @@ 
 				$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;
 				$properties["flag_request"] = "PT_STRING8:PSETID_Common:" . PidLidFlagRequest;
 				$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;
-				$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence;                                     // AppointmentSequenceNumber
-				$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
+				$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence; // AppointmentSequenceNumber
+				$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["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,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
 				// Propose new time properties
 				$properties["proposed_start_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
 				$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedEndWhole;
@@ -639,7 +639,7 @@ 
 				$properties = [];
 				$properties["entryid"] = PR_ENTRYID;
 				$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-				$properties["store_entryid"] = PR_STORE_ENTRYID;	// is this required ???
+				$properties["store_entryid"] = PR_STORE_ENTRYID; // is this required ???
 				$properties["icon_index"] = PR_ICON_INDEX;
 				$properties["message_class"] = PR_MESSAGE_CLASS;
 				$properties["message_flags"] = PR_MESSAGE_FLAGS;
@@ -955,9 +955,9 @@ 
 				$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 				$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
 				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;	// ClipStart
-				$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;		// ClipEnd
-				$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
+				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart; // ClipStart
+				$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd; // ClipEnd
+				$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 				$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 				// Propose new time properties
 				$properties["proposed_start_date"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
@@ -1243,18 +1243,18 @@ 
 				$properties["subject"] = PR_SUBJECT;
 				$properties["object_type"] = PR_OBJECT_TYPE;
 
-				$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;				// PidLidReminderSet
-				$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta;			// PidLidReminderDelta
-				$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime;			// PidLidReminderTime
-				$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;				// PidLidReminderSignalTime
+				$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet; // PidLidReminderSet
+				$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta; // PidLidReminderDelta
+				$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime; // PidLidReminderTime
+				$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime; // PidLidReminderSignalTime
 
-				$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate;				// PidLidTaskDueDate
-				$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate;			// PidLidTaskStartDate
-				$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
-				$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
+				$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate; // PidLidTaskDueDate
+				$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate; // PidLidTaskStartDate
+				$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107"; // PidLidTaskResetReminder
+				$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126"; // PidLidTaskFRecurring
 				$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
 
-				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;			// PidLidRecurring
+				$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring; // PidLidRecurring
 				$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 				$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 				$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;

server/includes/mapi/mapi.util.php

Spacing +3 added lines, -3 removed lines

@@ -232,7 +232,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,
@@ -261,8 +261,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"]];

server/includes/mapi/class.meetingrequest.php

Spacing +15 added lines, -15 removed lines

@@ -152,15 +152,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;
@@ -169,11 +169,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;
@@ -548,7 +548,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;
 		}
@@ -1483,7 +1483,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;
 		}
 
@@ -2487,7 +2487,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],
 			],
@@ -2763,7 +2763,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],
 			],
@@ -2981,7 +2981,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],
 					],
@@ -3084,7 +3084,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],
 				],
@@ -3190,7 +3190,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];
 			}