grommunio / grommunio-sync

config.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
     define('TIMEZONE', '');
 
     // Defines the base path on the server
-    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/');
+    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 
     // Try to set unlimited timeout
     define('SCRIPT_TIMEOUT', 0);
@@ -80,8 +80,8 @@ 
 
     // Filelog settings
     define('LOGFILEDIR', '/var/log/grommunio-sync/');
-    define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
-    define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-error.log');
+    define('LOGFILE', LOGFILEDIR.'grommunio-sync.log');
+    define('LOGERRORFILE', LOGFILEDIR.'grommunio-sync-error.log');
 
     // Syslog settings
     // false will log to local syslog, otherwise put the remote syslog IP here

mapi/class.taskrequest.php

Spacing +39 added lines, -39 removed lines

@@ -23,12 +23,12 @@ 
      * carried in the IPM.TaskRequest item (although this information seems
      * redundant due to that information already being available in PR_MESSAGE_CLASS).
      */
-    define('tdmtNothing', 0);            // Value in IPM.Task items
-    define('tdmtTaskReq', 1);            // Assigner -> Assignee
-    define('tdmtTaskAcc', 2);            // Assignee -> Assigner
-    define('tdmtTaskDec', 3);            // Assignee -> Assigner
-    define('tdmtTaskUpd', 4);            // Assignee -> Assigner
-    define('tdmtTaskSELF', 5);            // Assigner -> Assigner (?)
+    define('tdmtNothing', 0); // Value in IPM.Task items
+    define('tdmtTaskReq', 1); // Assigner -> Assignee
+    define('tdmtTaskAcc', 2); // Assignee -> Assigner
+    define('tdmtTaskDec', 3); // Assignee -> Assigner
+    define('tdmtTaskUpd', 4); // Assignee -> Assigner
+    define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
     /* The TaskHistory is used to show the last action on the task
      * on both the assigner and the assignee's side.
@@ -38,22 +38,22 @@ 
      * the format 'Accepted by <user> on 01-01-2010 11:00'.
      */
     define('thNone', 0);
-    define('thAccepted', 1);            // Set by assignee
-    define('thDeclined', 2);            // Set by assignee
-    define('thUpdated', 3);                // Set by assignee
+    define('thAccepted', 1); // Set by assignee
+    define('thDeclined', 2); // Set by assignee
+    define('thUpdated', 3); // Set by assignee
     define('thDueDateChanged', 4);
-    define('thAssigned', 5);            // Set by assigner
+    define('thAssigned', 5); // Set by assigner
 
     /* The TaskState value is used to differentiate the version of a task
      * in the assigner's folder and the version in the
      * assignee's folder. The buttons shown depend on this and
      * the 'taskaccepted' boolean (for the assignee)
      */
-    define('tdsNOM', 0);        // Got a response to a deleted task, and re-created the task for the assigner
-    define('tdsOWNNEW', 1);        // Not assigned
-    define('tdsOWN', 2);        // Assignee version
-    define('tdsACC', 3);        // Assigner version
-    define('tdsDEC', 4);        // Assigner version, but assignee declined
+    define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+    define('tdsOWNNEW', 1); // Not assigned
+    define('tdsOWN', 2); // Assignee version
+    define('tdsACC', 3); // Assigner version
+    define('tdsDEC', 4); // Assigner version, but assignee declined
 
     /* The TaskAcceptanceState is used for the assigner to indicate state */
     define('olTaskNotDelegated', 0);
@@ -63,13 +63,13 @@ 
 
     /* The task ownership indicates the role of the current user relative to the task. */
     define('olNewTask', 0);
-    define('olDelegatedTask', 1);    // Task has been assigned
-    define('olOwnTask', 2);            // Task owned
+    define('olDelegatedTask', 1); // Task has been assigned
+    define('olOwnTask', 2); // Task owned
 
     /* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
     define('tmrNone', 0);
-    define('tmrSent', 1);        // Task has been sent to multiple assignee
-    define('tmrReceived', 2);    // Task Request received has multiple assignee
+    define('tmrSent', 1); // Task has been sent to multiple assignee
+    define('tmrReceived', 2); // Task Request received has multiple assignee
 
     // Task icon index.
     define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -300,7 +300,7 @@ 
                     VALUE => $goid, ],
                 ];
 
-                $table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+                $table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
                 $softDeletedItems = mapi_table_queryallrows($table, [PR_ENTRYID], $restriction);
                 if (!empty($softDeletedItems)) {
                     return true;
@@ -503,14 +503,14 @@ 
             // Set properties on Task Request
             mapi_setprops($this->message, [
                 $this->props['task_goid'] => $taskid, /* our new task_goid */
-                $this->props['taskstate'] => tdsACC,         /* state for our outgoing request */
-                $this->props['taskmode'] => tdmtNothing,     /* we're not sending a change */
-                $this->props['updatecount'] => 2,            /* version 2 (no idea) */
+                $this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+                $this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+                $this->props['updatecount'] => 2, /* version 2 (no idea) */
                 $this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
                 $this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-                $this->props['taskhistory'] => thAssigned,    /* Task has been assigned */
+                $this->props['taskhistory'] => thAssigned, /* Task has been assigned */
                 PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
-                PR_ICON_INDEX => ICON_TASK_ASSIGNER,         /* Task request icon */
+                PR_ICON_INDEX => ICON_TASK_ASSIGNER, /* Task request icon */
             ]);
             $this->setLastUser();
             $this->setOwnerForAssignor();
@@ -525,12 +525,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'] => tdsOWN,         /* for the recipient he is the task owner */
-                $this->props['taskmode'] => tdmtTaskReq,    /* for the recipient it's a request */
-                $this->props['updatecount'] => 1,            /* version 2 is in the attachment */
+                PR_MESSAGE_CLASS => 'IPM.TaskRequest', /* class is task request */
+                $this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+                $this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+                $this->props['updatecount'] => 1, /* version 2 is in the attachment */
                 PR_SUBJECT_PREFIX => $prefix,
-                PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
+                PR_SUBJECT => $prefix.$messageprops[PR_SUBJECT],
             ]);
 
             $attach = mapi_message_createattach($outgoing);
@@ -539,7 +539,7 @@ 
                 PR_ATTACHMENT_HIDDEN => true,
                 PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], ]);
 
-            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
             mapi_copyto($this->message, [], [], $sub);
             mapi_savechanges($sub);
@@ -636,7 +636,7 @@ 
          * @return entryid EntryID of the accepted task
          */
         public function doAccept() {
-            $prefix = _('Task Accepted:') . ' ';
+            $prefix = _('Task Accepted:').' ';
             $messageProps = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->props['taskstate']]);
 
             if (!isset($messageProps[$this->props['taskstate']]) || tdsOWN != $messageProps[$this->props['taskstate']]) {
@@ -685,7 +685,7 @@ 
          * @return boolean TRUE on success, FALSE on failure
          */
         public function doDecline() {
-            $prefix = _('Task Declined:') . ' ';
+            $prefix = _('Task Declined:').' ';
             $messageProps = mapi_getprops($this->message, [$this->props['taskstate']]);
 
             if (!isset($messageProps[$this->props['taskstate']]) || tdsOWN != $messageProps[$this->props['taskstate']]) {
@@ -740,9 +740,9 @@ 
 
             $props = mapi_getprops($this->message, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']]);
             if (!$props[$this->props['complete']] && $props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
-                $this->sendResponse(tdmtTaskUpd, _('Task Updated:') . ' ');
+                $this->sendResponse(tdmtTaskUpd, _('Task Updated:').' ');
             } elseif ($props[$this->props['complete']]) {
-                $this->sendResponse(tdmtTaskUpd, _('Task Completed:') . ' ');
+                $this->sendResponse(tdmtTaskUpd, _('Task Completed:').' ');
             }
 
             return true;
@@ -875,7 +875,7 @@ 
 
             $attach = mapi_message_createattach($outgoing);
             mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true]);
-            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
             $message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -917,7 +917,7 @@ 
             mapi_savechanges($sub);
             mapi_savechanges($attach);
 
-            $props[PR_SUBJECT] = $prefix . $messageprops[PR_CONVERSATION_TOPIC];
+            $props[PR_SUBJECT] = $prefix.$messageprops[PR_CONVERSATION_TOPIC];
             $props[$this->props['taskmode']] = $type;
             $props[$this->props['task_assigned_time']] = time();
 
@@ -927,7 +927,7 @@ 
             // edit response before sending task response.
             if ($this->taskCommentsInfo) {
                 $comments = $this->getTaskCommentsInfo();
-                $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+                $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
                 mapi_stream_setsize($stream, strlen($comments));
                 mapi_stream_write($stream, $comments);
                 mapi_stream_commit($stream);
@@ -1181,7 +1181,7 @@ 
                 }
 
                 foreach ($recips as $recip) {
-                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
                     mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
                 }
 

mapi/class.recurrence.php

Spacing +15 added lines, -15 removed lines

@@ -587,8 +587,8 @@ 
             }
 
             // get timings of the first occurence
-            $firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
-            $firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
+            $firstoccstartdate = isset($startocc) ? $start + (((int)$startocc) * 60) : $start;
+            $firstoccenddate = isset($endocc) ? $end + (((int)$endocc) * 60) : $end;
 
             $start = gmdate(_('d-m-Y'), $firstoccstartdate);
             $end = gmdate(_('d-m-Y'), $firstoccenddate);
@@ -720,7 +720,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);
@@ -728,7 +728,7 @@ 
                     $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
 
                     foreach ($attachments as $attach_props) {
-                        $attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
+                        $attach_old = mapi_message_openattach($copy_attach_from, (int)$attach_props[PR_ATTACH_NUM]);
                         $attach_newResourceMsg = mapi_message_createattach($imessage);
                         mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
                         mapi_savechanges($attach_newResourceMsg);
@@ -1097,12 +1097,12 @@ 
             // Remove all deleted recipients
             if (isset($exception_recips['remove'])) {
                 foreach ($exception_recips['remove'] as &$recip) {
-                    if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-                        $recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+                    if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
+                        $recip[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
                     } else {
-                        $recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+                        $recip[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
                     }
-                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;        // No Response required
+                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
                 }
                 unset($recip);
                 mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1172,12 +1172,12 @@ 
 
                         // 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;
                         }
                     }
@@ -1236,11 +1236,11 @@ 
             $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;
                 }
             }
 
@@ -1254,7 +1254,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.

mapi/class.freebusypublish.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
                     ],
                 ], // EXISTS OR
             ],
-        ];        // global OR
+        ]; // global OR
 
         $contents = mapi_folder_getcontentstable($this->calendar);
         mapi_table_restrict($contents, $restrict);

mapi/mapidefs.php

Indentation +1 added lines, -1 removed lines

@@ -632,7 +632,7 @@
 /* PersistElementType Values ElementIDs for persist data of PR_IPM_OL2007_ENTRYIDS / PR_ADDITIONAL_REN_ENTRYIDS_EX */
 define('ELEMENT_SENTINEL', 0x0000); // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure.
 define('RSF_ELID_ENTRYID', 0x0001); // variable Indicates that the ElementData field contains the entry ID of the special folder
-                                                           // that is of the type indicated by the value of the PersistID field of the PersistData structure.
+                                                            // that is of the type indicated by the value of the PersistID field of the PersistData structure.
 define('RSF_ELID_HEADER', 0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
 
 define('STGM_DIRECT', 0x00000000);

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,23 +438,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('{3C253DCA-D227-443C-94FE-425FAB958C19}'));    // default store
-define('ZARAFA_STORE_PUBLIC_GUID', makeGuid('{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}'));    // 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('{70FAB278-F7AF-CD11-9BC8-00AA002FC45A}')); // 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}'));
@@ -481,10 +481,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);
 
@@ -500,7 +500,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);
@@ -570,38 +570,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);

mapi/mapi.util.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  * @param mixed $guid
  */
 function makeGuid($guid) {
-    return pack('vvvv', hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))) . hex2bin(substr($guid, 20, 4)) . hex2bin(substr($guid, 25, 12));
+    return pack('vvvv', hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))).hex2bin(substr($guid, 20, 4)).hex2bin(substr($guid, 25, 12));
 }
 
 /**
@@ -48,7 +48,7 @@ 
              * we have to manually typecast value to integer, so float will be converted in integer,
              * but still its out of bound for integer limit so it will be auto adjusted to minus value
              */
-            if ($errcode == (int) $value) {
+            if ($errcode == (int)$value) {
                 // Check that we have an actual MAPI error or warning definition
                 $prefix = substr($key, 0, 7);
                 if ('MAPI_E_' == $prefix || 'MAPI_W_' == $prefix) {
@@ -63,7 +63,7 @@ 
     // error code not found, return hex value (this is a fix for 64-bit systems, we can't use the dechex() function for this)
     $result = unpack('H*', pack('N', $errcode));
 
-    return '0x' . $result[1];
+    return '0x'.$result[1];
 }
 
 /**
@@ -163,7 +163,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_REMOTE_VALID($value) {
-    return (bool) ($value & DTE_FLAG_REMOTE_VALID);
+    return (bool)($value & DTE_FLAG_REMOTE_VALID);
 }
 
 /**
@@ -172,7 +172,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_ACL_CAPABLE($value) {
-    return (bool) ($value & DTE_FLAG_ACL_CAPABLE);
+    return (bool)($value & DTE_FLAG_ACL_CAPABLE);
 }
 
 function DTE_REMOTE($value) {
@@ -219,7 +219,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,
@@ -243,7 +243,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/mapicode.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
  * @param mixed $code
  */
 function make_mapi_e($code) {
-    return (int) mapi_make_scode(1, $code);
+    return (int)mapi_make_scode(1, $code);
 }
 
 /**
@@ -36,7 +36,7 @@ 
  * @param mixed $code
  */
 function make_mapi_s($code) {
-    return (int) mapi_make_scode(0, $code);
+    return (int)mapi_make_scode(0, $code);
 }
 
 /* From mapicode.h */

mapi/class.meetingrequest.php

Spacing +29 added lines, -29 removed lines

@@ -152,15 +152,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['flagdueby'] = 'PT_SYSTIME:PSETID_Common:0x8560';
@@ -169,11 +169,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';
@@ -540,7 +540,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;
         }
@@ -1404,7 +1404,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;
         }
 
@@ -2029,9 +2029,9 @@ 
             $subjectprefix = _('New Time Proposed');
         }
 
-        $props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
+        $props[PR_SUBJECT] = $subjectprefix.': '.$messageprops[PR_SUBJECT];
 
-        $props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.' . $classpostfix;
+        $props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.'.$classpostfix;
         if (isset($messageprops[PR_OWNER_APPT_ID])) {
             $props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
         }
@@ -2237,11 +2237,11 @@ 
         $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;
             }
         }
 
@@ -2255,7 +2255,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.
@@ -2313,7 +2313,7 @@ 
         $month = $basedate ? sprintf('%02s', dechex(gmdate('m', $basedate))) : '00';
         $day = $basedate ? sprintf('%02s', dechex(gmdate('d', $basedate))) : '00';
 
-        return hex2bin(strtoupper(substr($hexguid, 0, 32) . $year . $month . $day . substr($hexguid, 40)));
+        return hex2bin(strtoupper(substr($hexguid, 0, 32).$year.$month.$day.substr($hexguid, 40)));
     }
 
     /**
@@ -2351,7 +2351,7 @@ 
                     continue;
                 }
 
-                $attachOld = mapi_message_openattach($copyFrom, (int) $attachProps[PR_ATTACH_NUM]);
+                $attachOld = mapi_message_openattach($copyFrom, (int)$attachProps[PR_ATTACH_NUM]);
                 $attachNewResourceMsg = mapi_message_createattach($copyTo);
                 mapi_copyto($attachOld, [], [], $attachNewResourceMsg, 0);
                 mapi_savechanges($attachNewResourceMsg);
@@ -2437,7 +2437,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],
                 ],
@@ -2566,7 +2566,7 @@ 
 
                 // Prefix the subject if needed
                 if ($prefix && isset($messageprops[PR_SUBJECT])) {
-                    $messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
+                    $messageprops[PR_SUBJECT] = $prefix.$messageprops[PR_SUBJECT];
                 }
 
                 // Set status to cancelled if needed
@@ -2707,7 +2707,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],
                 ],
@@ -2929,7 +2929,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],
                     ],
@@ -2984,7 +2984,7 @@ 
 
         // Prefix the subject if needed
         if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
-            $newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+            $newmessageprops[PR_SUBJECT] = $prefix.$newmessageprops[PR_SUBJECT];
         }
 
         if (isset($newmessageprops[$this->proptags['categories']])
@@ -3018,7 +3018,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],
                                         ],
@@ -3124,9 +3124,9 @@ 
             $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] = _('Canceled: ') . $newmessageprops[PR_SUBJECT];
+                $newmessageprops[PR_SUBJECT] = _('Canceled: ').$newmessageprops[PR_SUBJECT];
             }
 
             mapi_setprops($new, $newmessageprops);
@@ -3184,12 +3184,12 @@ 
 
             // [0] => year, [1] => month, [2] => day, [3] => hour, [4] => minutes, [5] => seconds
             // RecurStartDate = year * 512 + month_number * 32 + day_number
-            $newmessageprops[$this->proptags['start_recur_date']] = (((int) $startDate[0]) * 512) + (((int) $startDate[1]) * 32) + ((int) $startDate[2]);
+            $newmessageprops[$this->proptags['start_recur_date']] = (((int)$startDate[0]) * 512) + (((int)$startDate[1]) * 32) + ((int)$startDate[2]);
             // RecurStartTime = hour * 4096 + minutes * 64 + seconds
-            $newmessageprops[$this->proptags['start_recur_time']] = (((int) $startDate[3]) * 4096) + (((int) $startDate[4]) * 64) + ((int) $startDate[5]);
+            $newmessageprops[$this->proptags['start_recur_time']] = (((int)$startDate[3]) * 4096) + (((int)$startDate[4]) * 64) + ((int)$startDate[5]);
 
-            $newmessageprops[$this->proptags['end_recur_date']] = (((int) $endDate[0]) * 512) + (((int) $endDate[1]) * 32) + ((int) $endDate[2]);
-            $newmessageprops[$this->proptags['end_recur_time']] = (((int) $endDate[3]) * 4096) + (((int) $endDate[4]) * 64) + ((int) $endDate[5]);
+            $newmessageprops[$this->proptags['end_recur_date']] = (((int)$endDate[0]) * 512) + (((int)$endDate[1]) * 32) + ((int)$endDate[2]);
+            $newmessageprops[$this->proptags['end_recur_time']] = (((int)$endDate[3]) * 4096) + (((int)$endDate[4]) * 64) + ((int)$endDate[5]);
         }
     }
 

mapi/class.baserecurrence.php

Switch Indentation +142 added lines, -142 removed lines

@@ -1711,186 +1711,186 @@
                 // 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;
-                    }
-
-                    if (0 == $this->recur['subtype']) {
-                        // Every Nth day
-                        for ($now = $daystart; $now <= $dayend && (0 == $limit || count($items) < $limit); $now += 60 * $this->recur['everyn']) {
-                            $this->processOccurrenceItem($items, $start, $end, $now, $this->recur['startocc'], $this->recur['endocc'], $this->tz, $remindersonly);
+                    case 10:
+                        // Daily
+                        if ($this->recur['everyn'] <= 0) {
+                            $this->recur['everyn'] = 1440;
                         }
-                    } else {
-                        // Every workday
-                        for ($now = $daystart; $now <= $dayend && (0 == $limit || 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
+
+                        if (0 == $this->recur['subtype']) {
+                            // Every Nth day
+                            for ($now = $daystart; $now <= $dayend && (0 == $limit || count($items) < $limit); $now += 60 * $this->recur['everyn']) {
                                 $this->processOccurrenceItem($items, $start, $end, $now, $this->recur['startocc'], $this->recur['endocc'], $this->tz, $remindersonly);
                             }
+                        } else {
+                            // Every workday
+                            for ($now = $daystart; $now <= $dayend && (0 == $limit || 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 && (0 == $limit || 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);
-                        } else {
-                            // 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) {
-                                    $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);
+                            $daystart += (60 * 60 * 24 * 7 * $this->recur['everyn']);
+                        }
+
+                        for ($now = $daystart; $now <= $dayend && (0 == $limit || 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);
+                            } else {
+                                // 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) {
+                                        $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;
-                    }
+                        break;
 
-                    // Loop through all months from start to end of occurrence, starting at beginning of first month
-                    for ($now = $this->monthStartOf($daystart); $now <= $dayend && (0 == $limit || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur['everyn']) * 24 * 60 * 60) {
-                        if (isset($this->recur['monthday']) && ('undefined' != $this->recur['monthday']) && !$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;
-                            }
-                            $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);
-                            }
-                        } elseif (isset($this->recur['nday'], $this->recur['weekdays'])) { // Nth [weekday] of every N months
-                            // Sanitize input
-                            if (0 == $this->recur['weekdays']) {
-                                $this->recur['weekdays'] = 1;
-                            }
+                    case 12:
+                        // Monthly
+                        if ($this->recur['everyn'] <= 0) {
+                            $this->recur['everyn'] = 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, $total = $this->daysInMonth($now, 1); $day < $total; ++$day) {
-                                    $daynow = $now + $day * 60 * 60 * 24;
-                                    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+                        // Loop through all months from start to end of occurrence, starting at beginning of first month
+                        for ($now = $this->monthStartOf($daystart); $now <= $dayend && (0 == $limit || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur['everyn']) * 24 * 60 * 60) {
+                            if (isset($this->recur['monthday']) && ('undefined' != $this->recur['monthday']) && !$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;
+                                }
+                                $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);
+                                }
+                            } elseif (isset($this->recur['nday'], $this->recur['weekdays'])) { // Nth [weekday] of every N months
+                                // Sanitize input
+                                if (0 == $this->recur['weekdays']) {
+                                    $this->recur['weekdays'] = 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;
+                                // 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, $total = $this->daysInMonth($now, 1); $day < $total; ++$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;
+                                            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);
+                                    // $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);
-                            }
-                        } 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 ($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);
+                                if ($now <= $dayend) {
+                                    $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur['startocc'], $this->recur['endocc'], $this->tz, $remindersonly);
+                                }
                             }
                         }
-                    }
 
-                    break;
+                        break;
 
-                case 13:
-                    // Yearly
-                    if ($this->recur['everyn'] <= 0) {
-                        $this->recur['everyn'] = 12;
-                    }
+                    case 13:
+                        // Yearly
+                        if ($this->recur['everyn'] <= 0) {
+                            $this->recur['everyn'] = 12;
+                        }
 
-                    for ($now = $this->yearStartOf($daystart); $now <= $dayend && (0 == $limit || 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;
-
-                            // 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
-
-                                if ($this->recur['weekdays'] & (1 << $nowtime['tm_wday'])) { // Selected ?
-                                    $firstday = $wday;
+                        for ($now = $this->yearStartOf($daystart); $now <= $dayend && (0 == $limit || 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;
 
-                                    break;
+                                // 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
+
+                                    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;
+                                // 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;
-                            }
+                                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 */);
+                                $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);
+                                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_occurences'])) {

Spacing +78 added lines, -78 removed lines

@@ -570,14 +570,14 @@ 
                 return;
             }
 
-            $rdata = pack('CCCCCCV', 0x04, 0x30, 0x04, 0x30, (int) $this->recur['type'], 0x20, (int) $this->recur['subtype']);
+            $rdata = pack('CCCCCCV', 0x04, 0x30, 0x04, 0x30, (int)$this->recur['type'], 0x20, (int)$this->recur['subtype']);
 
             $weekstart = 1; // monday
             $forwardcount = 0;
             $restocc = 0;
-            $dayofweek = (int) gmdate('w', (int) $this->recur['start']); // 0 (for Sunday) through 6 (for Saturday)
+            $dayofweek = (int)gmdate('w', (int)$this->recur['start']); // 0 (for Sunday) through 6 (for Saturday)
 
-            $term = (int) $this->recur['type'];
+            $term = (int)$this->recur['type'];
 
             switch ($term) {
                 case 0x0A:
@@ -592,12 +592,12 @@ 
                     } else {
                         // Daily every N days (everyN in minutes)
 
-                        $everyn = ((int) $this->recur['everyn']) / 1440;
+                        $everyn = ((int)$this->recur['everyn']) / 1440;
 
                         // Calc first occ
-                        $firstocc = $this->unixDataToRecurData($this->recur['start']) % ((int) $this->recur['everyn']);
+                        $firstocc = $this->unixDataToRecurData($this->recur['start']) % ((int)$this->recur['everyn']);
 
-                        $rdata .= pack('VVV', $firstocc, (int) $this->recur['everyn'], $this->recur['regen'] ? 1 : 0);
+                        $rdata .= pack('VVV', $firstocc, (int)$this->recur['everyn'], $this->recur['regen'] ? 1 : 0);
                     }
 
                     break;
@@ -620,7 +620,7 @@ 
                         $daycount = 0;
                         $dayskip = -1;
                         for ($j = 0; $j < 7; ++$j) {
-                            if (((int) $this->recur['weekdays']) & (1 << (($dayofweek + $j) % 7))) {
+                            if (((int)$this->recur['weekdays']) & (1 << (($dayofweek + $j) % 7))) {
                                 if (-1 == $dayskip) {
                                     $dayskip = $j;
                                 }
@@ -639,34 +639,34 @@ 
 
                         // Check if the recurrence ends after a number of occurences, in that case we must calculate the
                         // remaining occurences based on the start of the recurrence.
-                        if (((int) $this->recur['term']) == 0x22) {
+                        if (((int)$this->recur['term']) == 0x22) {
                             // $weekskip is the amount of weeks to skip from the startdate before the first occurence
                             // $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);
+                            $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;
+                            $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'];
+                            $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);
+                        $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 = ($this->unixDataToRecurData($this->recur['start'])) % (((int)$this->recur['everyn']) * 7 * 24 * 60);
 
-                    $firstocc -= (((int) gmdate('w', (int) $this->recur['start'])) - 1) * 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);
+                        $rdata .= pack('VVV', $firstocc, (int)$this->recur['everyn'], 1);
                     } else {
-                        $rdata .= pack('VVVV', $firstocc, (int) $this->recur['everyn'], 0, (int) $this->recur['weekdays']);
+                        $rdata .= pack('VVVV', $firstocc, (int)$this->recur['everyn'], 0, (int)$this->recur['weekdays']);
                     }
 
                     break;
@@ -683,30 +683,30 @@ 
                     }
 
                     if (0x0C == $term /* monthly */) {
-                        $everyn = (int) $this->recur['everyn'];
+                        $everyn = (int)$this->recur['everyn'];
                     } else {
-                        $everyn = $this->recur['regen'] ? ((int) $this->recur['everyn']) * 12 : 12;
+                        $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']);
+                    $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 occurences, in that case we must calculate the
                     // remaining occurences based on the start of the recurrence.
-                    if (((int) $this->recur['term']) == 0x22) {
+                    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);
+                        $forwardcount = ((((int)$this->recur['numoccur']) - 1) * $everyn);
                     }
 
                     // Get month for yearly on D'th day of month M
                     if (0x0D == $term /* yearly */) {
-                        $selmonth = floor(((int) $this->recur['month']) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
+                        $selmonth = floor(((int)$this->recur['month']) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
                     }
 
-                    switch ((int) $this->recur['subtype']) {
+                    switch ((int)$this->recur['subtype']) {
                         // on D day of every M month
                         case 2:
                             if (!isset($this->recur['monthday'])) {
@@ -719,11 +719,11 @@ 
                             // 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;
+                            $this->recur['start'] += (((int)$this->recur['monthday']) - 1) * 24 * 60 * 60;
 
                             // If the previous calculation gave us a start date different than the original start date, then we need to skip to the first occurrence
-                            if ((0x0C == $term /* monthly */ && ((int) $this->recur['monthday']) < $curmonthday)
-                                || (0x0D == $term /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int) $this->recur['monthday']) < $curmonthday)))) {
+                            if ((0x0C == $term /* monthly */ && ((int)$this->recur['monthday']) < $curmonthday)
+                                || (0x0D == $term /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int)$this->recur['monthday']) < $curmonthday)))) {
                                 if (0x0D == $term /* yearly */) {
                                     if ($curmonth > $selmonth) {// go to next occurrence in 'everyn' months minus difference in first occurrence and original date
                                         $count = $everyn - ($curmonth - $selmonth);
@@ -731,7 +731,7 @@ 
                                         $count = $selmonth - $curmonth;
                                     } else {
                                         // Go to next occurrence while recurrence start date is greater than occurrence date but within same month
-                                        if (((int) $this->recur['monthday']) < $curmonthday) {
+                                        if (((int)$this->recur['monthday']) < $curmonthday) {
                                             $count = $everyn;
                                         }
                                     }
@@ -756,32 +756,32 @@ 
                             // 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 (((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;
                             }
 
                             // "start" is now the first occurrence
 
                             if (0x0C == $term /* monthly */) {
                                 // Calc first occ
-                                $monthIndex = ((((12 % $everyn) * ((((int) gmdate('Y', $this->recur['start'])) - 1601) % $everyn)) % $everyn) + (((int) gmdate('n', $this->recur['start'])) - 1)) % $everyn;
+                                $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']);
+                                $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']);
+                                $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, $everyn, $this->recur['regen'], (int)$this->recur['monthday']);
                             }
 
                             break;
@@ -793,11 +793,11 @@ 
                                 return;
                             }
 
-                            $weekdays = (int) $this->recur['weekdays'];
-                            $nday = (int) $this->recur['nday'];
+                            $weekdays = (int)$this->recur['weekdays'];
+                            $nday = (int)$this->recur['nday'];
 
                             // Calc startdate
-                            $monthbegindow = (int) $this->recur['start'];
+                            $monthbegindow = (int)$this->recur['start'];
 
                             if (5 == $nday) {
                                 // Set date on the last day of the last month
@@ -829,12 +829,12 @@ 
 
                                 $dayofweek = gmdate('w', $monthbegindow);
                                 for ($i = 0; $i < 7; ++$i) {
-                                    if (5 == $nday && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+                                    if (5 == $nday && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                         $day = gmdate('j', $monthbegindow) - $i;
 
                                         break;
                                     }
-                                    if (5 != $nday && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+                                    if (5 != $nday && (1 << (($dayofweek + $i) % 7))&$weekdays) {
                                         $day = (($nday - 1) * 7) + ($i + 1);
 
                                         break;
@@ -842,7 +842,7 @@ 
                                 }
 
                                 // Goto the next X month
-                                if (isset($day) && ($day < gmdate('j', (int) $this->recur['start']))) {
+                                if (isset($day) && ($day < gmdate('j', (int)$this->recur['start']))) {
                                     if (5 == $nday) {
                                         $monthbegindow += 24 * 60 * 60;
                                         if (12 == $curmonth) {
@@ -874,12 +874,12 @@ 
                             // Set start on the right day
                             $dayofweek = gmdate('w', $monthbegindow);
                             for ($i = 0; $i < 7; ++$i) {
-                                if (5 == $nday && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+                                if (5 == $nday && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                     $day = $i;
 
                                     break;
                                 }
-                                if (5 != $nday && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+                                if (5 != $nday && (1 << (($dayofweek + $i) % 7))&$weekdays) {
                                     $day = ($nday - 1) * 7 + ($i + 1);
 
                                     break;
@@ -895,7 +895,7 @@ 
 
                             if (0x0C == $term /* monthly */) {
                                 // Calc first occ
-                                $monthIndex = ((((12 % $everyn) * (((int) gmdate('Y', $this->recur['start']) - 1601) % $everyn)) % $everyn) + (((int) gmdate('n', $this->recur['start'])) - 1)) % $everyn;
+                                $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;
@@ -904,7 +904,7 @@ 
                                 $rdata .= pack('VVVVV', $firstocc, $everyn, 0, $weekdays, $nday);
                             } else {
                                 // Calc first occ
-                                $monthIndex = (int) gmdate('n', $this->recur['start']);
+                                $monthIndex = (int)gmdate('n', $this->recur['start']);
 
                                 for ($i = 1; $i < $monthIndex; ++$i) {
                                     $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
@@ -924,7 +924,7 @@ 
             }
 
             // Terminate
-            $term = (int) $this->recur['term'];
+            $term = (int)$this->recur['term'];
             $rdata .= pack('CCCC', $term, 0x20, 0x00, 0x00);
 
             switch ($term) {
@@ -939,7 +939,7 @@ 
                         return;
                     }
 
-                    $rdata .= pack('V', (int) $this->recur['numoccur']);
+                    $rdata .= pack('V', (int)$this->recur['numoccur']);
 
                     break;
                 // Never ends
@@ -950,7 +950,7 @@ 
             }
 
             // Strange little thing for the recurrence type "every workday"
-            if (((int) $this->recur['type']) == 0x0B && ((int) $this->recur['subtype']) == 1) {
+            if (((int)$this->recur['type']) == 0x0B && ((int)$this->recur['subtype']) == 1) {
                 $rdata .= pack('V', 1);
             } else { // Other recurrences
                 $rdata .= pack('V', 0);
@@ -993,25 +993,25 @@ 
             }
 
             // Set start date
-            $rdata .= pack('V', $this->unixDataToRecurData((int) $this->recur['start']));
+            $rdata .= pack('V', $this->unixDataToRecurData((int)$this->recur['start']));
 
             // Set enddate
             switch ($term) {
                 // After the given enddate
                 case 0x21:
-                    $rdata .= pack('V', $this->unixDataToRecurData((int) $this->recur['end']));
+                    $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'];
+                    $occenddate = (int)$this->recur['start'];
 
-                    switch ((int) $this->recur['type']) {
+                    switch ((int)$this->recur['type']) {
                         case 0x0A: // daily
                             if (1 == $this->recur['subtype']) {
                                 // Daily every workday
-                                $restocc = (int) $this->recur['numoccur'];
+                                $restocc = (int)$this->recur['numoccur'];
 
                                 // Get starting weekday
                                 $nowtime = $this->gmtime($occenddate);
@@ -1032,7 +1032,7 @@ 
                                 }
                             } else {
                                 // -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)));
+                                $occenddate += (((int)$this->recur['everyn']) * 60 * (((int)$this->recur['numoccur'] - 1)));
                             }
 
                             break;
@@ -1051,11 +1051,11 @@ 
                             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;
+                                    $occenddate += (((int)$this->recur['everyn']) - 1) * 7 * 24 * 60 * 60;
                                 }
 
                                 // If this is a matching day, once less occurrence to process
-                                if (((int) $this->recur['weekdays']) & (1 << (($dayofweek + $j) % 7))) {
+                                if (((int)$this->recur['weekdays']) & (1 << (($dayofweek + $j) % 7))) {
                                     --$restocc;
                                 }
 
@@ -1067,11 +1067,11 @@ 
 
                         case 0x0C: // monthly
                         case 0x0D: // yearly
-                            $curyear = gmdate('Y', (int) $this->recur['start']);
-                            $curmonth = gmdate('n', (int) $this->recur['start']);
+                            $curyear = gmdate('Y', (int)$this->recur['start']);
+                            $curmonth = gmdate('n', (int)$this->recur['start']);
                             // $forwardcount = months
 
-                            switch ((int) $this->recur['subtype']) {
+                            switch ((int)$this->recur['subtype']) {
                                 case 2: // on D day of every M month
                                     while ($forwardcount > 0) {
                                         $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -1086,8 +1086,8 @@ 
                                     }
 
                                     // compensation between 28 and 31
-                                    if (((int) $this->recur['monthday']) >= 28 && ((int) $this->recur['monthday']) <= 31
-                                        && gmdate('j', $occenddate) < ((int) $this->recur['monthday'])) {
+                                    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 {
@@ -1098,8 +1098,8 @@ 
                                     break;
 
                                 case 3: // on Nth weekday of every M month
-                                    $nday = (int) $this->recur['nday']; // 1 tot 5
-                                    $weekdays = (int) $this->recur['weekdays'];
+                                    $nday = (int)$this->recur['nday']; // 1 tot 5
+                                    $weekdays = (int)$this->recur['weekdays'];
 
                                     while ($forwardcount > 0) {
                                         $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -1123,12 +1123,12 @@ 
 
                                     $dayofweek = gmdate('w', $occenddate);
                                     for ($i = 0; $i < 7; ++$i) {
-                                        if (5 == $nday && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+                                        if (5 == $nday && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                             $occenddate -= $i * 24 * 60 * 60;
 
                                             break;
                                         }
-                                        if (5 != $nday && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+                                        if (5 != $nday && (1 << (($dayofweek + $i) % 7))&$weekdays) {
                                             $occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
 
                                             break;
@@ -1147,7 +1147,7 @@ 
 
                     $this->recur['end'] = $occenddate;
 
-                    $rdata .= pack('V', $this->unixDataToRecurData((int) $this->recur['end']));
+                    $rdata .= pack('V', $this->unixDataToRecurData((int)$this->recur['end']));
 
                     break;
                 // Never ends
@@ -1160,12 +1160,12 @@ 
             }
 
             // UTC date
-            $utcstart = $this->toGMT($this->tz, (int) $this->recur['start']);
-            $utcend = $this->toGMT($this->tz, (int) $this->recur['end']);
+            $utcstart = $this->toGMT($this->tz, (int)$this->recur['start']);
+            $utcend = $this->toGMT($this->tz, (int)$this->recur['end']);
 
             // utc date+time
-            $utcfirstoccstartdatetime = (isset($this->recur['startocc'])) ? $utcstart + (((int) $this->recur['startocc']) * 60) : $utcstart;
-            $utcfirstoccenddatetime = (isset($this->recur['endocc'])) ? $utcstart + (((int) $this->recur['endocc']) * 60) : $utcstart;
+            $utcfirstoccstartdatetime = (isset($this->recur['startocc'])) ? $utcstart + (((int)$this->recur['startocc']) * 60) : $utcstart;
+            $utcfirstoccenddatetime = (isset($this->recur['endocc'])) ? $utcstart + (((int)$this->recur['endocc']) * 60) : $utcstart;
 
             $propsToSet = [];
             // update reminder time
@@ -1183,7 +1183,7 @@ 
 
                 // recurrencetype
                 // Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
-                $propsToSet[$this->proptags['recurrencetype']] = ((int) $this->recur['type']) - 0x9;
+                $propsToSet[$this->proptags['recurrencetype']] = ((int)$this->recur['type']) - 0x9;
 
                 // set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
                 $propsToSet[$this->proptags['side_effects']] = 369;
@@ -1230,7 +1230,7 @@ 
 
             if (isset($this->recur['startocc'], $this->recur['endocc'])) {
                 // Set start and endtime in minutes
-                $rdata .= pack('VV', (int) $this->recur['startocc'], (int) $this->recur['endocc']);
+                $rdata .= pack('VV', (int)$this->recur['startocc'], (int)$this->recur['endocc']);
             }
 
             // Detailed exception data
@@ -1285,7 +1285,7 @@ 
                     $subject = iconv('UTF-8', 'windows-1252//TRANSLIT', $changed_item['subject']);
                     $length = strlen($subject);
                     $rdata .= pack('vv', $length + 1, $length);
-                    $rdata .= pack('a' . $length, $subject);
+                    $rdata .= pack('a'.$length, $subject);
                 }
 
                 if (isset($changed_item['remind_before'])) {
@@ -1300,7 +1300,7 @@ 
                     $location = iconv('UTF-8', 'windows-1252//TRANSLIT', $changed_item['location']);
                     $length = strlen($location);
                     $rdata .= pack('vv', $length + 1, $length);
-                    $rdata .= pack('a' . $length, $location);
+                    $rdata .= pack('a'.$length, $location);
                 }
 
                 if (isset($changed_item['busystatus'])) {
@@ -1331,14 +1331,14 @@ 
                     $subject = iconv('UTF-8', 'UCS-2LE', $changed_item['subject']);
                     $length = iconv_strlen($subject, 'UCS-2LE');
                     $rdata .= pack('v', $length);
-                    $rdata .= pack('a' . $length * 2, $subject);
+                    $rdata .= pack('a'.$length * 2, $subject);
                 }
 
                 if (isset($changed_item['location'])) {
                     $location = iconv('UTF-8', 'UCS-2LE', $changed_item['location']);
                     $length = iconv_strlen($location, 'UCS-2LE');
                     $rdata .= pack('v', $length);
-                    $rdata .= pack('a' . $length * 2, $location);
+                    $rdata .= pack('a'.$length * 2, $location);
                 }
 
                 if (isset($changed_item['subject']) || isset($changed_item['location'])) {
@@ -1883,7 +1883,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) {