grommunio / grommunio-dav

mapi/class.recurrence.php

Spacing +2 added lines, -2 removed lines

@@ -1075,7 +1075,7 @@ 
                     } else {
                         $recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
                     }
-                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
+                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
                 }
                 unset($recip);
                 mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1150,7 +1150,7 @@ 
                             } else {
                                 $recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
                             }
-                            $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
+                            $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
                             $deletedRecipients[] = $recipient;
                         }
                     }

mapi/mapi.util.php

Spacing +2 added lines, -2 removed lines

@@ -221,7 +221,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,
@@ -245,7 +245,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 +77 added lines, -77 removed lines

@@ -16,40 +16,40 @@ 
 
 /* Object type */
 
-define('MAPI_STORE', 0x00000001);    /* Message Store */
-define('MAPI_ADDRBOOK', 0x00000002);    /* Address Book */
-define('MAPI_FOLDER', 0x00000003);    /* Folder */
-define('MAPI_ABCONT', 0x00000004);    /* Address Book Container */
-define('MAPI_MESSAGE', 0x00000005);    /* Message */
-define('MAPI_MAILUSER', 0x00000006);    /* Individual Recipient */
-define('MAPI_ATTACH', 0x00000007);    /* Attachment */
-define('MAPI_DISTLIST', 0x00000008);    /* Distribution List Recipient */
-define('MAPI_PROFSECT', 0x00000009);    /* Profile Section */
-define('MAPI_STATUS', 0x0000000A);    /* Status Object */
-define('MAPI_SESSION', 0x0000000B);    /* Session */
-define('MAPI_FORMINFO', 0x0000000C);    /* Form Information */
+define('MAPI_STORE', 0x00000001); /* Message Store */
+define('MAPI_ADDRBOOK', 0x00000002); /* Address Book */
+define('MAPI_FOLDER', 0x00000003); /* Folder */
+define('MAPI_ABCONT', 0x00000004); /* Address Book Container */
+define('MAPI_MESSAGE', 0x00000005); /* Message */
+define('MAPI_MAILUSER', 0x00000006); /* Individual Recipient */
+define('MAPI_ATTACH', 0x00000007); /* Attachment */
+define('MAPI_DISTLIST', 0x00000008); /* Distribution List Recipient */
+define('MAPI_PROFSECT', 0x00000009); /* Profile Section */
+define('MAPI_STATUS', 0x0000000A); /* Status Object */
+define('MAPI_SESSION', 0x0000000B); /* Session */
+define('MAPI_FORMINFO', 0x0000000C); /* Form Information */
 
 define('MV_FLAG', 0x1000);
 define('MV_INSTANCE', 0x2000);
 define('MVI_FLAG', MV_FLAG | MV_INSTANCE);
 
-define('PT_UNSPECIFIED', 0);    /* (Reserved for interface use) type doesn't matter to caller */
-define('PT_NULL', 1);    /* NULL property value */
-define('PT_I2', 2);    /* Signed 16-bit value */
-define('PT_LONG', 3);    /* Signed 32-bit value */
-define('PT_R4', 4);    /* 4-byte floating point */
-define('PT_DOUBLE', 5);    /* Floating point double */
-define('PT_CURRENCY', 6);    /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
-define('PT_APPTIME', 7);    /* Application time */
-define('PT_ERROR', 10);    /* 32-bit error value */
-define('PT_BOOLEAN', 11);    /* 16-bit boolean (non-zero true) */
-define('PT_OBJECT', 13);    /* Embedded object in a property */
-define('PT_I8', 20);    /* 8-byte signed integer */
-define('PT_STRING8', 30);    /* Null terminated 8-bit character string */
-define('PT_UNICODE', 31);    /* Null terminated Unicode string */
-define('PT_SYSTIME', 64);    /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
-define('PT_CLSID', 72);    /* OLE GUID */
-define('PT_BINARY', 258);   /* Uninterpreted (counted byte array) */
+define('PT_UNSPECIFIED', 0); /* (Reserved for interface use) type doesn't matter to caller */
+define('PT_NULL', 1); /* NULL property value */
+define('PT_I2', 2); /* Signed 16-bit value */
+define('PT_LONG', 3); /* Signed 32-bit value */
+define('PT_R4', 4); /* 4-byte floating point */
+define('PT_DOUBLE', 5); /* Floating point double */
+define('PT_CURRENCY', 6); /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
+define('PT_APPTIME', 7); /* Application time */
+define('PT_ERROR', 10); /* 32-bit error value */
+define('PT_BOOLEAN', 11); /* 16-bit boolean (non-zero true) */
+define('PT_OBJECT', 13); /* Embedded object in a property */
+define('PT_I8', 20); /* 8-byte signed integer */
+define('PT_STRING8', 30); /* Null terminated 8-bit character string */
+define('PT_UNICODE', 31); /* Null terminated Unicode string */
+define('PT_SYSTIME', 64); /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
+define('PT_CLSID', 72); /* OLE GUID */
+define('PT_BINARY', 258); /* Uninterpreted (counted byte array) */
 /* Changes are likely to these numbers, and to their structures. */
 
 /* Alternate property type names for ease of use */
@@ -190,14 +190,14 @@ 
 
 /* Values for PR_RESOURCE_TYPE, _METHODS, _FLAGS */
 
-define('MAPI_STORE_PROVIDER', 33);    /* Message Store */
-define('MAPI_AB', 34);    /* Address Book */
-define('MAPI_AB_PROVIDER', 35);    /* Address Book Provider */
-define('MAPI_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}'));
@@ -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.meetingrequest.php

Spacing +15 added lines, -15 removed lines

@@ -131,15 +131,15 @@ 
         $properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
         $properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
         $properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-        $properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201';					// AppointmentSequenceNumber
-        $properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';			// AppointmentLastSequence
+        $properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201'; // AppointmentSequenceNumber
+        $properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203'; // AppointmentLastSequence
         $properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
         $properties['busystatus'] = 'PT_LONG:PSETID_Appointment:0x8205';
         $properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:0x8224';
         $properties['start'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
         $properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
         $properties['location'] = 'PT_STRING8:PSETID_Appointment:0x8208';
-        $properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';		// PidLidFInvited, MeetingRequestWasSent
+        $properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229'; // PidLidFInvited, MeetingRequestWasSent
         $properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
         $properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:0x820e';
         $properties['commonstart'] = 'PT_SYSTIME:PSETID_Common:0x8516';
@@ -147,11 +147,11 @@ 
         $properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:0x8223';
         $properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:0x8235';
         $properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:0x8236';
-        $properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD';				// StartRecurTime
-        $properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE';				// StartRecurTime
-        $properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF';				// EndRecurDate
-        $properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10';				// EndRecurTime
-        $properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA';				// LID_IS_EXCEPTION
+        $properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD'; // StartRecurTime
+        $properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE'; // StartRecurTime
+        $properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF'; // EndRecurDate
+        $properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10'; // EndRecurTime
+        $properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA'; // LID_IS_EXCEPTION
         $properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
         // Propose new time properties
         $properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8250';
@@ -519,7 +519,7 @@ 
         $messageprops = mapi_getprops($this->message, $listProperties);
         $store = $this->store;
 
-        $goid = $messageprops[$this->proptags['goid']];	// GlobalID (0x3)
+        $goid = $messageprops[$this->proptags['goid']]; // GlobalID (0x3)
         if (!isset($goid)) {
             return;
         }
@@ -1290,7 +1290,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;
         }
 
@@ -2219,7 +2219,7 @@ 
         // Get resource recipients
         $getResourcesRestriction = [RES_AND,
             [[RES_PROPERTY,
-                [RELOP => RELOP_EQ,	// Equals recipient type 3: Resource
+                [RELOP => RELOP_EQ, // Equals recipient type 3: Resource
                     ULPROPTAG => PR_RECIPIENT_TYPE,
                     VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
                 ],
@@ -2470,7 +2470,7 @@ 
         // Get resource recipients
         $getResourcesRestriction = [RES_AND,
             [[RES_PROPERTY,
-                [RELOP => RELOP_EQ,	// Equals recipient type 3: Resource
+                [RELOP => RELOP_EQ, // Equals recipient type 3: Resource
                     ULPROPTAG => PR_RECIPIENT_TYPE,
                     VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
                 ],
@@ -2640,7 +2640,7 @@ 
             // In direct-booking mode, we don't need to send cancellations to resources
             if ($this->enableDirectBooking) {
                 $restriction[1][] = [RES_PROPERTY,
-                    [RELOP => RELOP_NE,	// Does not equal recipient type: MAPI_BCC (Resource)
+                    [RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
                         ULPROPTAG => PR_RECIPIENT_TYPE,
                         VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
                     ],
@@ -2724,7 +2724,7 @@ 
         if ($this->enableDirectBooking) {
             $stripResourcesRestriction[1][] =
                                     [RES_PROPERTY,
-                                        [RELOP => RELOP_NE,	// Does not equal recipient type: MAPI_BCC (Resource)
+                                        [RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
                                             ULPROPTAG => PR_RECIPIENT_TYPE,
                                             VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
                                         ],
@@ -2796,7 +2796,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('kopano', 'Canceled') . ': ' . $newmessageprops[PR_SUBJECT];
             }

mapi/class.taskrequest.php

Spacing +32 added lines, -32 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
@@ -268,13 +268,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();
@@ -287,12 +287,12 @@ 
 
             // 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
@@ -406,7 +406,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);
 
@@ -435,7 +435,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);
 
@@ -872,7 +872,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

Spacing +1 added lines, -1 removed lines

@@ -1819,7 +1819,7 @@
                             $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
+                            $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);

lib/GLogger.php

Switch Indentation +29 added lines, -29 removed lines

@@ -172,37 +172,37 @@
         }
 
         switch ($errno) {
-            case 0:
-                // logging disabled by LOG_ERROR_MASK
-                break;
-
-            case E_DEPRECATED:
-                // do not handle this message
-                break;
-
-            case E_NOTICE:
-            case E_WARNING:
-                $logger = \Logger::getLogger('error');
-                $logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
-
-                break;
-
-            default:
-                $bt = debug_backtrace();
-                $logger = \Logger::getLogger('error');
-                $logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . ' steps');
-                for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
-                    $file = $line = 'unknown';
-                    if (isset($bt[$i]['file'])) {
-                        $file = $bt[$i]['file'];
-                    }
-                    if (isset($bt[$i]['line'])) {
-                        $line = $bt[$i]['line'];
-                    }
-                    $logger->error("trace: {$i}:" . $file . ':' . $line . ' - ' . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : '') . $bt[$i]['function'] . '()');
+        case 0:
+            // logging disabled by LOG_ERROR_MASK
+            break;
+
+        case E_DEPRECATED:
+            // do not handle this message
+            break;
+
+        case E_NOTICE:
+        case E_WARNING:
+            $logger = \Logger::getLogger('error');
+            $logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
+
+            break;
+
+        default:
+            $bt = debug_backtrace();
+            $logger = \Logger::getLogger('error');
+            $logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . ' steps');
+            for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
+                $file = $line = 'unknown';
+                if (isset($bt[$i]['file'])) {
+                    $file = $bt[$i]['file'];
                 }
+                if (isset($bt[$i]['line'])) {
+                    $line = $bt[$i]['line'];
+                }
+                $logger->error("trace: {$i}:" . $file . ':' . $line . ' - ' . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : '') . $bt[$i]['function'] . '()');
+            }
 
-                break;
+            break;
         }
     }
 

lib/GrommunioDavBackend.php

Spacing +1 added lines, -1 removed lines

@@ -607,7 +607,7 @@
                     ],
                 ], // EXISTS OR
             ],
-        ];        // global OR
+        ]; // global OR
     }
 
     /**