grommunio / grommunio-sync

mapi/class.taskrequest.php

Spacing +82 added lines, -82 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);
@@ -165,12 +165,12 @@ 
          */
         function isTaskRequest($messageClass = false)
         {
-            if($messageClass === false) {
+            if ($messageClass === false) {
                 $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
                 $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
             }
 
-            if($messageClass !== false &&  $messageClass === "IPM.TaskRequest") {
+            if ($messageClass !== false && $messageClass === "IPM.TaskRequest") {
                 return true;
             }
 
@@ -184,12 +184,12 @@ 
          */
         function isTaskRequestResponse($messageClass = false)
         {
-            if($messageClass === false) {
+            if ($messageClass === false) {
                 $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
                 $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
             }
 
-            if($messageClass !== false &&  strpos($messageClass, "IPM.TaskRequest.") === 0) {
+            if ($messageClass !== false && strpos($messageClass, "IPM.TaskRequest.") === 0) {
                 return true;
             }
 
@@ -222,7 +222,7 @@ 
         {
             $props = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->props['task_goid']));
 
-            if($props[PR_MESSAGE_CLASS] == "IPM.Task") {
+            if ($props[PR_MESSAGE_CLASS] == "IPM.Task") {
                 // Message itself is task, so return that
                 return $this->message;
             }
@@ -240,9 +240,9 @@ 
 
             $rows = mapi_table_queryallrows($contents, array(PR_ENTRYID), $restriction);
 
-            if(empty($rows)) {
+            if (empty($rows)) {
                 // None found, create one if possible
-                if(!$create) {
+                if (!$create) {
                     return false;
                 }
 
@@ -288,7 +288,7 @@ 
             $result = false;
             $associatedTask = $this->getAssociatedTask(false);
             if ($this->isTaskRequest($props[PR_MESSAGE_CLASS])) {
-                if($associatedTask) {
+                if ($associatedTask) {
                     return true;
                 } else {
                     $folder = $this->getDefaultTasksFolder();
@@ -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, array(PR_ENTRYID), $restriction);
                     if (!empty($softDeletedItems)) {
                         return true;
@@ -315,7 +315,7 @@ 
                  * if(message_counter >= task_counter) task is not updated, do normal processing
                  */
                 if (isset($taskItemProps[$this->props['updatecount']], $props[$this->props['updatecount']])) {
-                    if($props[$this->props['updatecount']] < $taskItemProps[$this->props['updatecount']]) {
+                    if ($props[$this->props['updatecount']] < $taskItemProps[$this->props['updatecount']]) {
                         $result = true;
                     }
                 }
@@ -345,7 +345,7 @@ 
 
             // If task is updated in task folder then we don't need to process
             // old response
-            if($this->isTaskRequestUpdated()) {
+            if ($this->isTaskRequestUpdated()) {
                 return true;
             }
 
@@ -379,7 +379,7 @@ 
                     break;
             }
 
-            $props =  array($this->props['taskhistory'] => $taskHistory,
+            $props = array($this->props['taskhistory'] => $taskHistory,
                 $this->props['taskstate'] => $taskState,
                 $this->props['task_acceptance_state'] => $taskAcceptanceState,
                 $this->props['ownership'] => $taskOwner);
@@ -391,7 +391,7 @@ 
                 // all attachments from associated task.
                 $taskAttachTable = mapi_message_getattachmenttable($task);
                 $taskAttachments = mapi_table_queryallrows($taskAttachTable, array(PR_ATTACH_NUM));
-                foreach($taskAttachments as $taskAttach) {
+                foreach ($taskAttachments as $taskAttach) {
                     mapi_message_deleteattach($task, $taskAttach[PR_ATTACH_NUM]);
                 }
 
@@ -426,7 +426,7 @@ 
                 mapi_setprops($task, $senderProps);
 
                 // Update taskstate and task history (last action done by the assignee)
-                mapi_setprops($task,$props);
+                mapi_setprops($task, $props);
 
                 mapi_savechanges($task);
             }
@@ -434,7 +434,7 @@ 
             mapi_setprops($this->message, $props);
             mapi_savechanges($this->message);
 
-            if($isReceivedItem) {
+            if ($isReceivedItem) {
                 $this->updateSentTaskRequest();
             }
             return true;
@@ -458,7 +458,7 @@ 
             $storeProps = mapi_getprops($store, array(PR_IPM_SENTMAIL_ENTRYID));
 
             $sentFolder = mapi_msgstore_openentry($store, $storeProps[PR_IPM_SENTMAIL_ENTRYID]);
-            if(!$sentFolder) {
+            if (!$sentFolder) {
                 return false;
             }
 
@@ -472,7 +472,7 @@ 
 
             $rows = mapi_table_queryallrows($contentsTable, array(PR_ENTRYID), $restriction);
 
-            if(!empty($rows)) {
+            if (!empty($rows)) {
                 foreach ($rows as $row) {
                     $sentTaskRequest = mapi_msgstore_openentry($store, $row[PR_ENTRYID]);
                     mapi_setprops($sentTaskRequest, $props);
@@ -496,12 +496,12 @@ 
             // Set properties on Task Request
             mapi_setprops($this->message, array(
                 $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*/
             ));
@@ -518,12 +518,12 @@ 
 
             // Make it a task request, and put it in sent items after it is sent
             mapi_setprops($outgoing, array(
-                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);
@@ -532,7 +532,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, array(), array(), $sub);
             mapi_savechanges($sub);
@@ -553,7 +553,7 @@ 
         function updateTaskRequest() {
             $messageprops = mapi_getprops($this->message, array($this->props['updatecount']));
 
-            if(isset($messageprops)) {
+            if (isset($messageprops)) {
                 $messageprops[$this->props['updatecount']]++;
             } else {
                 $messageprops[$this->props['updatecount']] = 1;
@@ -578,7 +578,7 @@ 
 
             // if task is updated in task folder then we don't need to process
             // old request.
-            if($this->isTaskRequestUpdated()) {
+            if ($this->isTaskRequestUpdated()) {
                 return true;
             }
 
@@ -629,10 +629,10 @@ 
          * @return entryid EntryID of the accepted task
          */
         function doAccept() {
-            $prefix = _("Task Accepted:") . " ";
+            $prefix = _("Task Accepted:")." ";
             $messageProps = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->props['taskstate']));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 // Can only accept assignee task
                 return false;
             }
@@ -678,10 +678,10 @@ 
          * @return boolean TRUE on success, FALSE on failure
          */
         function doDecline() {
-            $prefix = _("Task Declined:") . " ";
+            $prefix = _("Task Declined:")." ";
             $messageProps = mapi_getprops($this->message, array($this->props['taskstate']));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only decline assignee task
             }
 
@@ -718,7 +718,7 @@ 
         function doUpdate() {
             $messageProps = mapi_getprops($this->message, array($this->props['taskstate'], PR_SUBJECT));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only update assignee task
             }
 
@@ -732,9 +732,9 @@ 
 
             $props = mapi_getprops($this->message, array($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:") . " ");
-            } else if($props[$this->props['complete']]) {
-                $this->sendResponse(tdmtTaskUpd, _("Task Completed:") . " ");
+                $this->sendResponse(tdmtTaskUpd, _("Task Updated:")." ");
+            } else if ($props[$this->props['complete']]) {
+                $this->sendResponse(tdmtTaskUpd, _("Task Completed:")." ");
             }
             return true;
         }
@@ -750,21 +750,21 @@ 
             $ownerentryid = false;
 
             $rcvdprops = mapi_getprops($this->message, array(PR_RCVD_REPRESENTING_ENTRYID));
-            if(isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            if (isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
                 $ownerentryid = $rcvdprops;
             }
 
-            if(!$ownerentryid) {
+            if (!$ownerentryid) {
                 $store = $this->store;
             } else {
                 $ab = mapi_openaddressbook($this->session);
-                if(!$ab) return false;
+                if (!$ab) return false;
 
                 $mailuser = mapi_ab_openentry($ab, $ownerentryid);
-                if(!$mailuser) return false;
+                if (!$mailuser) return false;
 
                 $mailuserprops = mapi_getprops($mailuser, array(PR_EMAIL_ADDRESS));
-                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
+                if (!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
 
                 $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
 
@@ -783,7 +783,7 @@ 
 
             $inbox = mapi_msgstore_getreceivefolder($store);
             $inboxprops = mapi_getprops($inbox, Array(PR_IPM_TASK_ENTRYID));
-            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
+            if (!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
                 return false;
 
             return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
@@ -827,10 +827,10 @@ 
             $storeprops = mapi_getprops($store, array(PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID));
 
             $outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
-            if(!$outbox) return false;
+            if (!$outbox) return false;
 
             $outgoing = mapi_folder_createmessage($outbox);
-            if(!$outgoing) return false;
+            if (!$outgoing) return false;
 
             // Set SENT_REPRESENTING in case we're sending as a delegate
             $ownerstore = $this->getTaskFolderStore();
@@ -856,7 +856,7 @@ 
 
             $attach = mapi_message_createattach($outgoing);
             mapi_setprops($attach, array(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);
 
@@ -870,7 +870,7 @@ 
             }
 
             $props = array();
-            switch($type) {
+            switch ($type) {
                 case tdmtTaskAcc:
                     $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Accept";
                     mapi_setprops($sub, array(PR_ICON_INDEX => ICON_TASK_ASSIGNER));
@@ -881,7 +881,7 @@ 
                     break;
                 case tdmtTaskUpd:
                     mapi_setprops($sub, array(PR_ICON_INDEX => ICON_TASK_ASSIGNER));
-                    if($messageprops[$this->props['complete']]) {
+                    if ($messageprops[$this->props['complete']]) {
                         $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Complete";
                     } else {
                         $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Update";
@@ -893,7 +893,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();
 
@@ -903,7 +903,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);
@@ -919,8 +919,8 @@ 
             $table = mapi_getmsgstorestable($this->session);
             $rows = mapi_table_queryallrows($table, array(PR_DEFAULT_STORE, PR_ENTRYID));
 
-            foreach($rows as $row) {
-                if($row[PR_DEFAULT_STORE])
+            foreach ($rows as $row) {
+                if ($row[PR_DEFAULT_STORE])
                     return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
             }
 
@@ -935,7 +935,7 @@ 
         function createTGOID()
         {
             $goid = "";
-            for($i=0;$i<16;$i++) {
+            for ($i = 0; $i < 16; $i++) {
                 $goid .= chr(rand(0, 255));
             }
             return $goid;
@@ -959,7 +959,7 @@ 
                             );
             $rows = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM), $restriction);
 
-            if(empty($rows)) {
+            if (empty($rows)) {
                 return $task;
             }
 
@@ -972,7 +972,7 @@ 
                 }
 
                 $taskGoid = mapi_getprops($task, array($this->props["task_goid"]));
-                if($goid[$this->props["task_goid"]] === $taskGoid[$this->props["task_goid"]]) {
+                if ($goid[$this->props["task_goid"]] === $taskGoid[$this->props["task_goid"]]) {
                     mapi_setprops($attach, array(PR_ATTACHMENT_HIDDEN => true));
                     mapi_savechanges($attach);
                     mapi_savechanges($message);
@@ -1042,11 +1042,11 @@ 
 
             // Delete all MAPI_TO recipients
             $recips = mapi_table_queryallrows($recipTable, array(PR_ROWID), array(RES_PROPERTY,
-                                                                                array(    RELOP => RELOP_EQ,
+                                                                                array(RELOP => RELOP_EQ,
                                                                                         ULPROPTAG => PR_RECIPIENT_TYPE,
                                                                                         VALUE => MAPI_TO
                                                                                 )));
-            foreach($recips as $recip) {
+            foreach ($recips as $recip) {
                 mapi_message_modifyrecipients($task, MODRECIP_REMOVE, array($recip));
             }
 
@@ -1112,7 +1112,7 @@ 
 
             $rows = mapi_table_queryallrows($contents, array(PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID), $restriction);
 
-            if(!empty($rows)) {
+            if (!empty($rows)) {
                 // If there are multiple, just use the first
                 $entryid = $rows[0][PR_ENTRYID];
                 $wastebasket = mapi_msgstore_openentry($store, $storeProps[PR_IPM_WASTEBASKET_ENTRYID]);
@@ -1146,7 +1146,7 @@ 
 
                 $recipTable = mapi_message_getrecipienttable($this->message);
                 $recips = mapi_table_queryallrows($recipTable, $this->recipProps, array(RES_PROPERTY,
-                                                                                        array(    RELOP => RELOP_EQ,
+                                                                                        array(RELOP => RELOP_EQ,
                                                                                                 ULPROPTAG => PR_RECIPIENT_TYPE,
                                                                                                 VALUE => ($isComplete ? MAPI_BCC : MAPI_CC)
                                                                                         )
@@ -1157,8 +1157,8 @@ 
                     return false;
                 }
 
-                foreach($recips as $recip) {
-                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+                foreach ($recips as $recip) {
+                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
                     mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, array($recip));
                 }
                 return true;
@@ -1187,7 +1187,7 @@ 
             $recipTable = mapi_message_getrecipienttable($message);
             $recipRows = mapi_table_queryallrows($recipTable, array(PR_ROWID));
 
-            foreach($recipRows as $recipient) {
+            foreach ($recipRows as $recipient) {
                 mapi_message_modifyrecipients($message, MODRECIP_REMOVE, array($recipient));
             }
         }
@@ -1202,7 +1202,7 @@ 
         {
             $messageprops = mapi_getprops($this->message, array($this->props['taskstate']));
 
-            if(!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only decline assignee task
             }
 

Braces +21 added lines, -9 removed lines

@@ -758,13 +758,19 @@ 
                 $store = $this->store;
             } else {
                 $ab = mapi_openaddressbook($this->session);
-                if(!$ab) return false;
+                if(!$ab) {
+                    return false;
+                }
 
                 $mailuser = mapi_ab_openentry($ab, $ownerentryid);
-                if(!$mailuser) return false;
+                if(!$mailuser) {
+                    return false;
+                }
 
                 $mailuserprops = mapi_getprops($mailuser, array(PR_EMAIL_ADDRESS));
-                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
+                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) {
+                    return false;
+                }
 
                 $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
 
@@ -783,8 +789,9 @@ 
 
             $inbox = mapi_msgstore_getreceivefolder($store);
             $inboxprops = mapi_getprops($inbox, Array(PR_IPM_TASK_ENTRYID));
-            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
-                return false;
+            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID])) {
+                            return false;
+            }
 
             return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
         }
@@ -827,10 +834,14 @@ 
             $storeprops = mapi_getprops($store, array(PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID));
 
             $outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
-            if(!$outbox) return false;
+            if(!$outbox) {
+                return false;
+            }
 
             $outgoing = mapi_folder_createmessage($outbox);
-            if(!$outgoing) return false;
+            if(!$outgoing) {
+                return false;
+            }
 
             // Set SENT_REPRESENTING in case we're sending as a delegate
             $ownerstore = $this->getTaskFolderStore();
@@ -920,8 +931,9 @@ 
             $rows = mapi_table_queryallrows($table, array(PR_DEFAULT_STORE, PR_ENTRYID));
 
             foreach($rows as $row) {
-                if($row[PR_DEFAULT_STORE])
-                    return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                if($row[PR_DEFAULT_STORE]) {
+                                    return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                }
             }
 
             return false;

mapi/class.recurrence.php

Indentation +38 added lines, -38 removed lines

@@ -439,13 +439,13 @@ 
         }
 
         /**
-        * This function returns the next remindertime starting from $timestamp
-        * When no next reminder exists, false is returned.
-        *
-        * Note: Before saving this new reminder time (when snoozing), you must check for
-        *       yourself if this reminder time is earlier than your snooze time, else
-        *       use your snooze time and not this reminder time.
-        */
+         * This function returns the next remindertime starting from $timestamp
+         * When no next reminder exists, false is returned.
+         *
+         * Note: Before saving this new reminder time (when snoozing), you must check for
+         *       yourself if this reminder time is earlier than your snooze time, else
+         *       use your snooze time and not this reminder time.
+         */
         function getNextReminderTime($timestamp)
         {
             /**
@@ -618,10 +618,10 @@ 
                 } else {
                     if ($occSingleDayRank) {
                         $pattern = sprintf(ngettext('Occurs every %s effective %s for %s occurence.',
-                                                     'Occurs every %s effective %s for %s occurences.', $numocc), $type, $start, $numocc);
+                                                        'Occurs every %s effective %s for %s occurences.', $numocc), $type, $start, $numocc);
                     } else {
                         $pattern = sprintf(ngettext('Occurs every %s %s effective %s for %s occurence.',
-                                                         'Occurs every %s %s effective %s for %s occurences.', $numocc), $everyn, $type, $start, $numocc);
+                                                            'Occurs every %s %s effective %s for %s occurences.', $numocc), $everyn, $type, $start, $numocc);
                     }
                 }
             } else if ($term == 0x21) {
@@ -683,18 +683,18 @@ 
          */
         function createExceptionAttachment($exception_props, $exception_recips = array(), $copy_attach_from = false)
         {
-              // Create new attachment.
-              $attachment = mapi_message_createattach($this->message);
-              $props = array();
-              $props[PR_ATTACHMENT_FLAGS] = 2;
-              $props[PR_ATTACHMENT_HIDDEN] = true;
-              $props[PR_ATTACHMENT_LINKID] = 0;
-              $props[PR_ATTACH_FLAGS] = 0;
-              $props[PR_ATTACH_METHOD] = 5;
-              $props[PR_DISPLAY_NAME] = "Exception";
-              $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
-              $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
-              mapi_setprops($attachment, $props);
+                // Create new attachment.
+                $attachment = mapi_message_createattach($this->message);
+                $props = array();
+                $props[PR_ATTACHMENT_FLAGS] = 2;
+                $props[PR_ATTACHMENT_HIDDEN] = true;
+                $props[PR_ATTACHMENT_LINKID] = 0;
+                $props[PR_ATTACH_FLAGS] = 0;
+                $props[PR_ATTACH_METHOD] = 5;
+                $props[PR_DISPLAY_NAME] = "Exception";
+                $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
+                $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);
 
@@ -748,11 +748,11 @@ 
                 $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
                 $exception = mapi_attach_openobj($tempattach);
 
-                  $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
+                    $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
 
-                  if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
-                      mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
-                  }
+                    if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
+                        mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
+                    }
             }
         }
 
@@ -1125,19 +1125,19 @@ 
                     }
 
                     if (!$found) {
-                       $foundInDeletedRecipients = false;
-                       // Look if the $recipient is in the list of deleted recipients
-                       if (!empty($deletedRecipients)) {
-                               foreach($deletedRecipients as $recip) {
-                                   if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){
-                                       $foundInDeletedRecipients = true;
-                                       break;
-                                   }
-                               }
-                       }
-
-                       // If recipient is not in list of deleted recipient, add him
-                       if (!$foundInDeletedRecipients) {
+                        $foundInDeletedRecipients = false;
+                        // Look if the $recipient is in the list of deleted recipients
+                        if (!empty($deletedRecipients)) {
+                                foreach($deletedRecipients as $recip) {
+                                    if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){
+                                        $foundInDeletedRecipients = true;
+                                        break;
+                                    }
+                                }
+                        }
+
+                        // 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;
                             } else {

Spacing +112 added lines, -112 removed lines

@@ -114,17 +114,17 @@ 
             $basetime = $baseday + $this->recur["startocc"] * 60;
 
             // Remove any pre-existing exception on this base date
-            if($this->isException($baseday)) {
+            if ($this->isException($baseday)) {
                 $this->deleteException($baseday); // note that deleting an exception is different from creating a deleted exception (deleting an occurrence).
             }
 
-            if(!$delete) {
-                if(isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+            if (!$delete) {
+                if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
                     return false;
                 }
                 // Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
                 foreach (array("subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus") as $propname) {
-                    if(isset($this->messageprops[$this->proptags[$propname]]))
+                    if (isset($this->messageprops[$this->proptags[$propname]]))
                         $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
                 }
 
@@ -145,11 +145,11 @@ 
                 }
 
                 // synchronize commonstart/commonend with startdate/duedate
-                if(isset($props[$this->proptags["startdate"]])) {
+                if (isset($props[$this->proptags["startdate"]])) {
                     $props[$this->proptags["commonstart"]] = $props[$this->proptags["startdate"]];
                 }
 
-                if(isset($props[$this->proptags["duedate"]])) {
+                if (isset($props[$this->proptags["duedate"]])) {
                     $props[$this->proptags["commonend"]] = $props[$this->proptags["duedate"]];
                 }
 
@@ -162,31 +162,31 @@ 
                 $changed_item["start"] = $this->fromGMT($this->tz, $props[$this->proptags["startdate"]]);
                 $changed_item["end"] = $this->fromGMT($this->tz, $props[$this->proptags["duedate"]]);
 
-                if(array_key_exists($this->proptags["subject"], $exception_props)) {
+                if (array_key_exists($this->proptags["subject"], $exception_props)) {
                     $changed_item["subject"] = $exception_props[$this->proptags["subject"]];
                 }
 
-                if(array_key_exists($this->proptags["location"], $exception_props)) {
+                if (array_key_exists($this->proptags["location"], $exception_props)) {
                     $changed_item["location"] = $exception_props[$this->proptags["location"]];
                 }
 
-                if(array_key_exists($this->proptags["label"], $exception_props)) {
+                if (array_key_exists($this->proptags["label"], $exception_props)) {
                     $changed_item["label"] = $exception_props[$this->proptags["label"]];
                 }
 
-                if(array_key_exists($this->proptags["reminder"], $exception_props)) {
+                if (array_key_exists($this->proptags["reminder"], $exception_props)) {
                     $changed_item["reminder_set"] = $exception_props[$this->proptags["reminder"]];
                 }
 
-                if(array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+                if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
                     $changed_item["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
                 }
 
-                if(array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+                if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
                     $changed_item["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
                 }
 
-                if(array_key_exists($this->proptags["busystatus"], $exception_props)) {
+                if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
                     $changed_item["busystatus"] = $exception_props[$this->proptags["busystatus"]];
                 }
 
@@ -198,7 +198,7 @@ 
             }
 
             // Turn on hideattachments, because the attachments in this item are the exceptions
-            mapi_setprops($this->message, array ( $this->proptags["hideattachments"] => true ));
+            mapi_setprops($this->message, array($this->proptags["hideattachments"] => true));
 
             // Save recurrence data to message
             $this->saveRecurrence();
@@ -212,74 +212,74 @@ 
          */
         function modifyException($exception_props, $base_date, $exception_recips = array(), $copy_attach_from = false)
         {
-            if(isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+            if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
                 return false;
             }
 
             $baseday = $this->dayStartOf($base_date);
             $extomodify = false;
 
-            for($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
-                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
+            for ($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
+                if ($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
                     $extomodify = &$this->recur["changed_occurences"][$i];
             }
 
-            if(!$extomodify)
+            if (!$extomodify)
                 return false;
 
             // remove basedate property as we want to preserve the old value
             // client will send basedate with time part as zero, so discard that value
             unset($exception_props[$this->proptags["basedate"]]);
 
-            if(array_key_exists($this->proptags["startdate"], $exception_props)) {
+            if (array_key_exists($this->proptags["startdate"], $exception_props)) {
                 $extomodify["start"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
             }
 
-            if(array_key_exists($this->proptags["duedate"], $exception_props)) {
-                $extomodify["end"] =   $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
+            if (array_key_exists($this->proptags["duedate"], $exception_props)) {
+                $extomodify["end"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
             }
 
-            if(array_key_exists($this->proptags["subject"], $exception_props)) {
+            if (array_key_exists($this->proptags["subject"], $exception_props)) {
                 $extomodify["subject"] = $exception_props[$this->proptags["subject"]];
             }
 
-            if(array_key_exists($this->proptags["location"], $exception_props)) {
+            if (array_key_exists($this->proptags["location"], $exception_props)) {
                 $extomodify["location"] = $exception_props[$this->proptags["location"]];
             }
 
-            if(array_key_exists($this->proptags["label"], $exception_props)) {
+            if (array_key_exists($this->proptags["label"], $exception_props)) {
                 $extomodify["label"] = $exception_props[$this->proptags["label"]];
             }
 
-            if(array_key_exists($this->proptags["reminder"], $exception_props)) {
+            if (array_key_exists($this->proptags["reminder"], $exception_props)) {
                 $extomodify["reminder_set"] = $exception_props[$this->proptags["reminder"]];
             }
 
-            if(array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+            if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
                 $extomodify["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
             }
 
-            if(array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+            if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
                 $extomodify["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
             }
 
-            if(array_key_exists($this->proptags["busystatus"], $exception_props)) {
+            if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
                 $extomodify["busystatus"] = $exception_props[$this->proptags["busystatus"]];
             }
 
             $exception_props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
 
             // synchronize commonstart/commonend with startdate/duedate
-            if(isset($exception_props[$this->proptags["startdate"]])) {
+            if (isset($exception_props[$this->proptags["startdate"]])) {
                 $exception_props[$this->proptags["commonstart"]] = $exception_props[$this->proptags["startdate"]];
             }
 
-            if(isset($exception_props[$this->proptags["duedate"]])) {
+            if (isset($exception_props[$this->proptags["duedate"]])) {
                 $exception_props[$this->proptags["commonend"]] = $exception_props[$this->proptags["duedate"]];
             }
 
             $attach = $this->getExceptionAttachment($baseday);
-            if(!$attach) {
+            if (!$attach) {
                 if ($copy_attach_from) {
                     $this->deleteExceptionAttachment($base_date);
                     $this->createException($exception_props, $base_date, false, $exception_recips, $copy_attach_from);
@@ -326,7 +326,7 @@ 
             // The way we do this is to look at the days that we're 'moving' the item in the exception. Each
             // of these days may only contain the item that we're modifying. Any other item violates the rules.
 
-            if($this->isException($basedate)) {
+            if ($this->isException($basedate)) {
                 // If we're modifying an exception, we want to look at the days that we're 'moving' compared to where
                 // the exception used to be.
                 $oldexception = $this->getChangeException($basedate);
@@ -339,7 +339,7 @@ 
             $startday = $this->dayStartOf($start);
 
             // Get all the occurrences on the days between the basedate (may be reversed)
-            if($prevday < $startday)
+            if ($prevday < $startday)
                 $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
             else
                 $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
@@ -366,12 +366,12 @@ 
             // get all occurence items before the seleceted items occurence starttime
             $occitems = $this->getItems($this->messageprops[$this->proptags["startdate"]], $this->toGMT($this->tz, $basedate));
 
-            if(!empty($occitems)) {
+            if (!empty($occitems)) {
                 // as occitems array is sorted in ascending order of startdate, to get the previous occurence we take the last items in occitems .
                 $previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
 
                 // if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
-                if($startdate - ($reminderminutes*60) <= $previousitem_startdate)
+                if ($startdate - ($reminderminutes * 60) <= $previousitem_startdate)
                     return false;
             }
 
@@ -380,12 +380,12 @@ 
 
             // If there are another two occurrences, then the first is the current occurrence, and the one after that
             // is the next occurrence.
-            if(count($currentOcc) > 1) {
+            if (count($currentOcc) > 1) {
                 $next = $currentOcc[1];
                 // Get reminder time of the next occurrence.
                 $nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
                 // If the reminder time of the next item is before the start of this item, then that's not allowed
-                if($nextOccReminderTime <= $startdate)
+                if ($nextOccReminderTime <= $startdate)
                     return false;
             }
 
@@ -396,15 +396,15 @@ 
         function setRecurrence($tz, $recur)
         {
             // only reset timezone if specified
-            if($tz)
+            if ($tz)
                 $this->tz = $tz;
 
             $this->recur = $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
+            if (!isset($this->recur["changed_occurences"]))
                 $this->recur["changed_occurences"] = Array();
 
-            if(!isset($this->recur["deleted_occurences"]))
+            if (!isset($this->recur["deleted_occurences"]))
                 $this->recur["deleted_occurences"] = Array();
 
             $this->deleteAttachments();
@@ -412,29 +412,29 @@ 
 
             // if client has not set the recurring_pattern then we should generate it and save it
             $messageProps = mapi_getprops($this->message, Array($this->proptags["recurring_pattern"]));
-            if(empty($messageProps[$this->proptags["recurring_pattern"]])) {
+            if (empty($messageProps[$this->proptags["recurring_pattern"]])) {
                 $this->saveRecurrencePattern();
             }
         }
 
         // Returns the start or end time of the occurrence on the given base date.
         // This assumes that the basedate you supply is in LOCAL time
-        function getOccurrenceStart($basedate)  {
+        function getOccurrenceStart($basedate) {
             $daystart = $this->dayStartOf($basedate);
             return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60);
         }
 
-        function getOccurrenceEnd($basedate)  {
+        function getOccurrenceEnd($basedate) {
             $daystart = $this->dayStartOf($basedate);
             return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60);
         }
 
 
         // Backwards compatible code
-        function getOccurenceStart($basedate)  {
+        function getOccurenceStart($basedate) {
             return $this->getOccurrenceStart($basedate);
         }
-        function getOccurenceEnd($basedate)  {
+        function getOccurenceEnd($basedate) {
             return $this->getOccurrenceEnd($basedate);
         }
 
@@ -464,13 +464,13 @@ 
              * On the first occurence of greater nextreminder break the loop
              * and return the value to calling function.
              */
-            for($i = 0, $len = count($items); $i < $len; $i++)
+            for ($i = 0, $len = count($items); $i < $len; $i++)
             {
                 $item = $items[$i];
-                $tempnextreminder = $item[$this->proptags["startdate"]] - ( $item[$this->proptags["reminder_minutes"]] * 60 );
+                $tempnextreminder = $item[$this->proptags["startdate"]] - ($item[$this->proptags["reminder_minutes"]] * 60);
 
                 // If tempnextreminder is greater than timestamp then save it in nextreminder and break from the loop.
-                if($tempnextreminder > $timestamp)
+                if ($tempnextreminder > $timestamp)
                 {
                     $nextreminder = $tempnextreminder;
                     break;
@@ -575,8 +575,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);
@@ -641,8 +641,8 @@ 
                 }
             }
 
-            if(!empty($pattern)) {
-                mapi_setprops($this->message, Array($this->proptags["recurring_pattern"] => $pattern ));
+            if (!empty($pattern)) {
+                mapi_setprops($this->message, Array($this->proptags["recurring_pattern"] => $pattern));
             }
         }
 
@@ -656,16 +656,16 @@ 
             // Remove all items in $todelete from deleted_occurences
             $new = Array();
 
-            foreach($this->recur["deleted_occurences"] as $entry) {
-                if($entry != $base_date)
+            foreach ($this->recur["deleted_occurences"] as $entry) {
+                if ($entry != $base_date)
                     $new[] = $entry;
             }
             $this->recur["deleted_occurences"] = $new;
 
             $new = Array();
 
-            foreach($this->recur["changed_occurences"] as $entry) {
-                if(!$this->isSameDay($entry["basedate"], $base_date))
+            foreach ($this->recur["changed_occurences"] as $entry) {
+                if (!$this->isSameDay($entry["basedate"], $base_date))
                     $new[] = $entry;
                 else
                     $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
@@ -696,15 +696,15 @@ 
               $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);
-                if($attachmentTable) {
+                if ($attachmentTable) {
                     $attachments = mapi_table_queryallrows($attachmentTable, array(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]);
+                    foreach ($attachments as $attach_props) {
+                        $attach_old = mapi_message_openattach($copy_attach_from, (int)$attach_props[PR_ATTACH_NUM]);
                         $attach_newResourceMsg = mapi_message_createattach($imessage);
                         mapi_copyto($attach_old, array(), array(), $attach_newResourceMsg, 0);
                         mapi_savechanges($attach_newResourceMsg);
@@ -718,8 +718,8 @@ 
             // of an exception. This is only a quickfix as it is not yet possible
             // to change an existing exception.
             // remove mv properties when needed
-            foreach($props as $propTag=>$propVal){
-                if ((mapi_prop_type($propTag) & MV_FLAG) == MV_FLAG && is_null($propVal)){
+            foreach ($props as $propTag=>$propVal) {
+                if ((mapi_prop_type($propTag) & MV_FLAG) == MV_FLAG && is_null($propVal)) {
                     unset($props[$propTag]);
                 }
             }
@@ -743,14 +743,14 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachTable = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM));
 
-            foreach($attachTable as $attachRow)
+            foreach ($attachTable as $attachRow)
             {
                 $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
                 $exception = mapi_attach_openobj($tempattach);
 
                   $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
 
-                  if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
+                  if ($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
                       mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
                   }
             }
@@ -764,9 +764,9 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachTable = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM, PR_ATTACHMENT_HIDDEN));
 
-            foreach($attachTable as $attachRow)
+            foreach ($attachTable as $attachRow)
             {
-                if(isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
+                if (isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
                     mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
                 }
             }
@@ -792,21 +792,21 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachRows = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM), $attach_res);
 
-            if(is_array($attachRows)) {
-                foreach($attachRows as $attachRow)
+            if (is_array($attachRows)) {
+                foreach ($attachRows as $attachRow)
                 {
                     $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
                     $exception = mapi_attach_openobj($tempattach);
 
                     $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
 
-                    if(!isset($data[$this->proptags["basedate"]])) {
+                    if (!isset($data[$this->proptags["basedate"]])) {
                         // if no basedate found then it could be embedded message so ignore it
                         // we need proper restriction to exclude embedded messages as well
                         continue;
                     }
 
-                    if($this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
+                    if ($this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
                         return $tempattach;
                     }
                 }
@@ -831,9 +831,9 @@ 
         function processOccurrenceItem(&$items, $start, $end, $basedate, $startocc, $endocc, $tz, $reminderonly)
         {
             $exception = $this->isException($basedate);
-            if($exception){
+            if ($exception) {
                 return false;
-            }else{
+            } else {
                 $occstart = $basedate + $startocc * 60;
                 $occend = $basedate + $endocc * 60;
 
@@ -849,7 +849,7 @@ 
                  * starts at 00:00 and ends on 00:00. if it is so, then process
                  * the occurrence and send it in response.
                  */
-                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start))
+                if (($occstart >= $end || $occend <= $start) && !($occstart == $occend && $occstart == $start))
                     return;
 
                 // Properties for this occurrence are the same as the main object,
@@ -863,7 +863,7 @@ 
             }
 
             // If reminderonly is set, only add reminders
-            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
+            if ($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
                 return;
 
             $items[] = $newitem;
@@ -878,7 +878,7 @@ 
         function processExceptionItems(&$items, $start, $end)
         {
             $limit = 0;
-            foreach($this->recur["changed_occurences"] as $exception) {
+            foreach ($this->recur["changed_occurences"] as $exception) {
 
                 // Convert to GMT
                 $occstart = $this->toGMT($this->tz, $exception["start"]);
@@ -886,11 +886,11 @@ 
 
                 // Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
                 // see any part of the appointment. Partial overlaps DO match.
-                if($occstart >= $end || $occend <= $start)
+                if ($occstart >= $end || $occend <= $start)
                     continue;
 
                 array_push($items, $this->getExceptionProperties($exception));
-                if((count($items) == $limit))
+                if ((count($items) == $limit))
                     break;
                 }
         }
@@ -902,10 +902,10 @@ 
          */
         function isException($basedate)
         {
-            if($this->isDeleteException($basedate))
+            if ($this->isDeleteException($basedate))
                 return true;
 
-            if($this->getChangeException($basedate) != false)
+            if ($this->getChangeException($basedate) != false)
                 return true;
 
             return false;
@@ -917,9 +917,9 @@ 
         function isDeleteException($basedate)
         {
             // Check if the occurrence is deleted on the specified date
-            foreach($this->recur["deleted_occurences"] as $deleted)
+            foreach ($this->recur["deleted_occurences"] as $deleted)
             {
-                if($this->isSameDay($deleted, $basedate))
+                if ($this->isSameDay($deleted, $basedate))
                     return true;
             }
 
@@ -932,9 +932,9 @@ 
         function getChangeException($basedate)
         {
             // Check if the occurrence is modified on the specified date
-            foreach($this->recur["changed_occurences"] as $changed)
+            foreach ($this->recur["changed_occurences"] as $changed)
             {
-                if($this->isSameDay($changed["basedate"], $basedate))
+                if ($this->isSameDay($changed["basedate"], $basedate))
                     return $changed;
             }
 
@@ -975,31 +975,31 @@ 
             $item[$this->proptags["commonstart"]] = $item[$this->proptags["startdate"]];
             $item[$this->proptags["commonend"]] = $item[$this->proptags["duedate"]];
 
-            if(isset($exception["subject"])) {
+            if (isset($exception["subject"])) {
                 $item[$this->proptags["subject"]] = $exception["subject"];
             }
 
-            if(isset($exception["label"])) {
+            if (isset($exception["label"])) {
                 $item[$this->proptags["label"]] = $exception["label"];
             }
 
-            if(isset($exception["alldayevent"])) {
+            if (isset($exception["alldayevent"])) {
                 $item[$this->proptags["alldayevent"]] = $exception["alldayevent"];
             }
 
-            if(isset($exception["location"])) {
+            if (isset($exception["location"])) {
                 $item[$this->proptags["location"]] = $exception["location"];
             }
 
-            if(isset($exception["remind_before"])) {
+            if (isset($exception["remind_before"])) {
                 $item[$this->proptags["reminder_minutes"]] = $exception["remind_before"];
             }
 
-            if(isset($exception["reminder_set"])) {
+            if (isset($exception["reminder_set"])) {
                 $item[$this->proptags["reminder"]] = $exception["reminder_set"];
             }
 
-            if(isset($exception["busystatus"])) {
+            if (isset($exception["busystatus"])) {
                 $item[$this->proptags["busystatus"]] = $exception["busystatus"];
             }
 
@@ -1057,19 +1057,19 @@ 
 
             // Add organizer to meeting only if it is not organized.
             $msgprops = mapi_getprops($exception, array(PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']));
-            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized){
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
                 $this->addOrganizer($msgprops, $exception_recips['add']);
             }
 
             // 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']);
@@ -1112,14 +1112,14 @@ 
 
             // Add organizer to meeting only if it is not organized.
             $msgprops = mapi_getprops($message, array(PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']));
-            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized){
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
                 $this->addOrganizer($msgprops, $exception_recips);
             }
 
             if (!empty($exception_recips)) {
-                foreach($recipientRows as $key => $recipient) {
+                foreach ($recipientRows as $key => $recipient) {
                     $found = false;
-                    foreach($exception_recips as $excep_recip) {
+                    foreach ($exception_recips as $excep_recip) {
                         if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY])
                             $found = true;
                     }
@@ -1128,8 +1128,8 @@ 
                        $foundInDeletedRecipients = false;
                        // Look if the $recipient is in the list of deleted recipients
                        if (!empty($deletedRecipients)) {
-                               foreach($deletedRecipients as $recip) {
-                                   if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){
+                               foreach ($deletedRecipients as $recip) {
+                                   if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]) {
                                        $foundInDeletedRecipients = true;
                                        break;
                                    }
@@ -1138,12 +1138,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;
                         }
                     }
@@ -1180,7 +1180,7 @@ 
             $result = false;
             if (!empty($this->recur["changed_occurences"])) {
                 $result = array();
-                foreach($this->recur["changed_occurences"] as $exception) {
+                foreach ($this->recur["changed_occurences"] as $exception) {
                     $result[] = $exception["basedate"];
                 }
                 return $result;
@@ -1200,16 +1200,16 @@ 
         {
             $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)) {
+            foreach ($recipients as $key => $recipient) {
+                if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
                     $hasOrganizer = true;
-                } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])){
+                } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
                     // Recipients for an occurrence
-                    $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+                    $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
                 }
             }
 
-            if (!$hasOrganizer){
+            if (!$hasOrganizer) {
                 // Create organizer.
                 $organizer = array();
                 $organizer[PR_ENTRYID] = $messageProps[PR_SENT_REPRESENTING_ENTRYID];
@@ -1217,9 +1217,9 @@ 
                 $organizer[PR_EMAIL_ADDRESS] = $messageProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
                 $organizer[PR_RECIPIENT_TYPE] = MAPI_TO;
                 $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_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.

Braces +65 added lines, -45 removed lines

@@ -124,8 +124,9 @@ 
                 }
                 // Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
                 foreach (array("subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus") as $propname) {
-                    if(isset($this->messageprops[$this->proptags[$propname]]))
-                        $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
+                    if(isset($this->messageprops[$this->proptags[$propname]])) {
+                                            $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
+                    }
                 }
 
                 $props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
@@ -220,12 +221,14 @@ 
             $extomodify = false;
 
             for($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
-                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
-                    $extomodify = &$this->recur["changed_occurences"][$i];
+                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday)) {
+                                    $extomodify = &$this->recur["changed_occurences"][$i];
+                }
             }
 
-            if(!$extomodify)
-                return false;
+            if(!$extomodify) {
+                            return false;
+            }
 
             // remove basedate property as we want to preserve the old value
             // client will send basedate with time part as zero, so discard that value
@@ -339,10 +342,11 @@ 
             $startday = $this->dayStartOf($start);
 
             // Get all the occurrences on the days between the basedate (may be reversed)
-            if($prevday < $startday)
-                $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
-            else
-                $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
+            if($prevday < $startday) {
+                            $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
+            } else {
+                            $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
+            }
 
             // There should now be exactly one item, namely the item that we are modifying. If there are any other items in the range,
             // then we abort the change, since one of the rules has been violated.
@@ -371,8 +375,9 @@ 
                 $previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
 
                 // if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
-                if($startdate - ($reminderminutes*60) <= $previousitem_startdate)
-                    return false;
+                if($startdate - ($reminderminutes*60) <= $previousitem_startdate) {
+                                    return false;
+                }
             }
 
             // Get the endtime of the current occurrence and find the next two occurrences (including the current occurrence)
@@ -385,8 +390,9 @@ 
                 // Get reminder time of the next occurrence.
                 $nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
                 // If the reminder time of the next item is before the start of this item, then that's not allowed
-                if($nextOccReminderTime <= $startdate)
-                    return false;
+                if($nextOccReminderTime <= $startdate) {
+                                    return false;
+                }
             }
 
             // All was ok
@@ -396,16 +402,19 @@ 
         function setRecurrence($tz, $recur)
         {
             // only reset timezone if specified
-            if($tz)
-                $this->tz = $tz;
+            if($tz) {
+                            $this->tz = $tz;
+            }
 
             $this->recur = $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
-                $this->recur["changed_occurences"] = Array();
+            if(!isset($this->recur["changed_occurences"])) {
+                            $this->recur["changed_occurences"] = Array();
+            }
 
-            if(!isset($this->recur["deleted_occurences"]))
-                $this->recur["deleted_occurences"] = Array();
+            if(!isset($this->recur["deleted_occurences"])) {
+                            $this->recur["deleted_occurences"] = Array();
+            }
 
             $this->deleteAttachments();
             $this->saveRecurrence();
@@ -657,18 +666,20 @@ 
             $new = Array();
 
             foreach($this->recur["deleted_occurences"] as $entry) {
-                if($entry != $base_date)
-                    $new[] = $entry;
+                if($entry != $base_date) {
+                                    $new[] = $entry;
+                }
             }
             $this->recur["deleted_occurences"] = $new;
 
             $new = Array();
 
             foreach($this->recur["changed_occurences"] as $entry) {
-                if(!$this->isSameDay($entry["basedate"], $base_date))
-                    $new[] = $entry;
-                else
-                    $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
+                if(!$this->isSameDay($entry["basedate"], $base_date)) {
+                                    $new[] = $entry;
+                } else {
+                                    $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
+                }
             }
 
             $this->recur["changed_occurences"] = $new;
@@ -833,7 +844,7 @@ 
             $exception = $this->isException($basedate);
             if($exception){
                 return false;
-            }else{
+            } else{
                 $occstart = $basedate + $startocc * 60;
                 $occend = $basedate + $endocc * 60;
 
@@ -849,8 +860,9 @@ 
                  * starts at 00:00 and ends on 00:00. if it is so, then process
                  * the occurrence and send it in response.
                  */
-                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start))
-                    return;
+                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start)) {
+                                    return;
+                }
 
                 // Properties for this occurrence are the same as the main object,
                 // With these properties overridden
@@ -863,8 +875,9 @@ 
             }
 
             // If reminderonly is set, only add reminders
-            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
-                return;
+            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false)) {
+                            return;
+            }
 
             $items[] = $newitem;
         }
@@ -886,12 +899,14 @@ 
 
                 // Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
                 // see any part of the appointment. Partial overlaps DO match.
-                if($occstart >= $end || $occend <= $start)
-                    continue;
+                if($occstart >= $end || $occend <= $start) {
+                                    continue;
+                }
 
                 array_push($items, $this->getExceptionProperties($exception));
-                if((count($items) == $limit))
-                    break;
+                if((count($items) == $limit)) {
+                                    break;
+                }
                 }
         }
 
@@ -902,11 +917,13 @@ 
          */
         function isException($basedate)
         {
-            if($this->isDeleteException($basedate))
-                return true;
+            if($this->isDeleteException($basedate)) {
+                            return true;
+            }
 
-            if($this->getChangeException($basedate) != false)
-                return true;
+            if($this->getChangeException($basedate) != false) {
+                            return true;
+            }
 
             return false;
         }
@@ -919,8 +936,9 @@ 
             // Check if the occurrence is deleted on the specified date
             foreach($this->recur["deleted_occurences"] as $deleted)
             {
-                if($this->isSameDay($deleted, $basedate))
-                    return true;
+                if($this->isSameDay($deleted, $basedate)) {
+                                    return true;
+                }
             }
 
             return false;
@@ -934,8 +952,9 @@ 
             // Check if the occurrence is modified on the specified date
             foreach($this->recur["changed_occurences"] as $changed)
             {
-                if($this->isSameDay($changed["basedate"], $basedate))
-                    return $changed;
+                if($this->isSameDay($changed["basedate"], $basedate)) {
+                                    return $changed;
+                }
             }
 
             return false;
@@ -1120,8 +1139,9 @@ 
                 foreach($recipientRows as $key => $recipient) {
                     $found = false;
                     foreach($exception_recips as $excep_recip) {
-                        if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY])
-                            $found = true;
+                        if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY]) {
+                                                    $found = true;
+                        }
                     }
 
                     if (!$found) {

mapi/mapiguid.php

Spacing +20 added lines, -20 removed lines

@@ -5,30 +5,30 @@
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-define('IID_IStream',                           makeguid("{0000000c-0000-0000-c000-000000000046}"));
-define('IID_IMAPITable',                        makeguid("{00020301-0000-0000-c000-000000000046}"));
-define('IID_IMessage',                          makeguid("{00020307-0000-0000-c000-000000000046}"));
-define('IID_IExchangeExportChanges',            makeguid("{a3ea9cc0-d1b2-11cd-80fc-00aa004bba0b}"));
-define('IID_IExchangeImportContentsChanges',    makeguid("{f75abfa0-d0e0-11cd-80fc-00aa004bba0b}"));
-define('IID_IExchangeImportHierarchyChanges',   makeguid("{85a66cf0-d0e0-11cd-80fc-00aa004bba0b}"));
+define('IID_IStream', makeguid("{0000000c-0000-0000-c000-000000000046}"));
+define('IID_IMAPITable', makeguid("{00020301-0000-0000-c000-000000000046}"));
+define('IID_IMessage', makeguid("{00020307-0000-0000-c000-000000000046}"));
+define('IID_IExchangeExportChanges', makeguid("{a3ea9cc0-d1b2-11cd-80fc-00aa004bba0b}"));
+define('IID_IExchangeImportContentsChanges', makeguid("{f75abfa0-d0e0-11cd-80fc-00aa004bba0b}"));
+define('IID_IExchangeImportHierarchyChanges', makeguid("{85a66cf0-d0e0-11cd-80fc-00aa004bba0b}"));
 
-define('PSETID_Appointment',                    makeguid("{00062002-0000-0000-C000-000000000046}"));
-define('PSETID_Task',                           makeguid("{00062003-0000-0000-C000-000000000046}"));
-define('PSETID_Address',                        makeguid("{00062004-0000-0000-C000-000000000046}"));
-define('PSETID_Common',                         makeguid("{00062008-0000-0000-C000-000000000046}"));
-define('PSETID_Log',                            makeguid("{0006200A-0000-0000-C000-000000000046}"));
-define('PSETID_Note',                           makeguid("{0006200E-0000-0000-C000-000000000046}"));
-define('PSETID_Meeting',                        makeguid("{6ED8DA90-450B-101B-98DA-00AA003F1305}"));
-define('PSETID_Archive',                        makeguid("{72E98EBC-57D2-4AB5-B0AA-D50A7B531CB9}"));
+define('PSETID_Appointment', makeguid("{00062002-0000-0000-C000-000000000046}"));
+define('PSETID_Task', makeguid("{00062003-0000-0000-C000-000000000046}"));
+define('PSETID_Address', makeguid("{00062004-0000-0000-C000-000000000046}"));
+define('PSETID_Common', makeguid("{00062008-0000-0000-C000-000000000046}"));
+define('PSETID_Log', makeguid("{0006200A-0000-0000-C000-000000000046}"));
+define('PSETID_Note', makeguid("{0006200E-0000-0000-C000-000000000046}"));
+define('PSETID_Meeting', makeguid("{6ED8DA90-450B-101B-98DA-00AA003F1305}"));
+define('PSETID_Archive', makeguid("{72E98EBC-57D2-4AB5-B0AA-D50A7B531CB9}"));
 
-define('PS_MAPI',                               makeguid("{00020328-0000-0000-C000-000000000046}"));
-define('PS_PUBLIC_STRINGS',                     makeguid("{00020329-0000-0000-C000-000000000046}"));
-define('PS_INTERNET_HEADERS',                   makeguid("{00020386-0000-0000-c000-000000000046}"));
+define('PS_MAPI', makeguid("{00020328-0000-0000-C000-000000000046}"));
+define('PS_PUBLIC_STRINGS', makeguid("{00020329-0000-0000-C000-000000000046}"));
+define('PS_INTERNET_HEADERS', makeguid("{00020386-0000-0000-c000-000000000046}"));
 
-define('MUIDECSAB',                             makeguid("{50A921AC-D340-48ee-B319-FBA753304425}"));
+define('MUIDECSAB', makeguid("{50A921AC-D340-48ee-B319-FBA753304425}"));
 
 // grommunio Contact Provider GUIDs
-define('MUIDZCSAB',                             makeguid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
+define('MUIDZCSAB', makeguid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
 
 // sk added for grommunio-sync
-define ('PSETID_AirSync',                       makeguid("{71035549-0739-4DCB-9163-00F0580DBBDF}"));
+define('PSETID_AirSync', makeguid("{71035549-0739-4DCB-9163-00F0580DBBDF}"));

mapi/mapitags.php

Spacing +626 added lines, -626 removed lines

@@ -8,191 +8,191 @@ 
 if (!function_exists("mapi_prop_tag"))
     throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
 
-define('PR_ACKNOWLEDGEMENT_MODE'                      ,mapi_prop_tag(PT_LONG,        0x0001));
-define('PR_ALTERNATE_RECIPIENT_ALLOWED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0002));
-define('PR_AUTHORIZING_USERS'                         ,mapi_prop_tag(PT_BINARY,      0x0003));
-define('PR_AUTO_FORWARD_COMMENT'                      ,mapi_prop_tag(PT_TSTRING,     0x0004));
-define('PR_AUTO_FORWARDED'                            ,mapi_prop_tag(PT_BOOLEAN,     0x0005));
-define('PR_CONTENT_CONFIDENTIALITY_ALGORITHM_ID'      ,mapi_prop_tag(PT_BINARY,      0x0006));
-define('PR_CONTENT_CORRELATOR'                        ,mapi_prop_tag(PT_BINARY,      0x0007));
-define('PR_CONTENT_IDENTIFIER'                        ,mapi_prop_tag(PT_TSTRING,     0x0008));
-define('PR_CONTENT_LENGTH'                            ,mapi_prop_tag(PT_LONG,        0x0009));
-define('PR_CONTENT_RETURN_REQUESTED'                  ,mapi_prop_tag(PT_BOOLEAN,     0x000A));
-
-
-
-define('PR_CONVERSATION_KEY'                          ,mapi_prop_tag(PT_BINARY,      0x000B));
-
-define('PR_CONVERSION_EITS'                           ,mapi_prop_tag(PT_BINARY,      0x000C));
-define('PR_CONVERSION_WITH_LOSS_PROHIBITED'           ,mapi_prop_tag(PT_BOOLEAN,     0x000D));
-define('PR_CONVERTED_EITS'                            ,mapi_prop_tag(PT_BINARY,      0x000E));
-define('PR_DEFERRED_DELIVERY_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x000F));
-define('PR_DEFERRED_SEND_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x3FEF));
-define('PR_DELIVER_TIME'                              ,mapi_prop_tag(PT_SYSTIME,     0x0010));
-define('PR_DISCARD_REASON'                            ,mapi_prop_tag(PT_LONG,        0x0011));
-define('PR_DISCLOSURE_OF_RECIPIENTS'                  ,mapi_prop_tag(PT_BOOLEAN,     0x0012));
-define('PR_DL_EXPANSION_HISTORY'                      ,mapi_prop_tag(PT_BINARY,      0x0013));
-define('PR_DL_EXPANSION_PROHIBITED'                   ,mapi_prop_tag(PT_BOOLEAN,     0x0014));
-define('PR_EXPIRY_TIME'                               ,mapi_prop_tag(PT_SYSTIME,     0x0015));
-define('PR_IMPLICIT_CONVERSION_PROHIBITED'            ,mapi_prop_tag(PT_BOOLEAN,     0x0016));
-define('PR_IMPORTANCE'                                ,mapi_prop_tag(PT_LONG,        0x0017));
-define('PR_IPM_ID'                                    ,mapi_prop_tag(PT_BINARY,      0x0018));
-define('PR_LATEST_DELIVERY_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x0019));
-define('PR_MESSAGE_CLASS'                             ,mapi_prop_tag(PT_TSTRING,     0x001A));
-define('PR_MESSAGE_DELIVERY_ID'                       ,mapi_prop_tag(PT_BINARY,      0x001B));
-
-
-
-
-
-define('PR_MESSAGE_SECURITY_LABEL'                    ,mapi_prop_tag(PT_BINARY,      0x001E));
-define('PR_OBSOLETED_IPMS'                            ,mapi_prop_tag(PT_BINARY,      0x001F));
-define('PR_ORIGINALLY_INTENDED_RECIPIENT_NAME'        ,mapi_prop_tag(PT_BINARY,      0x0020));
-define('PR_ORIGINAL_EITS'                             ,mapi_prop_tag(PT_BINARY,      0x0021));
-define('PR_ORIGINATOR_CERTIFICATE'                    ,mapi_prop_tag(PT_BINARY,      0x0022));
-define('PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED'      ,mapi_prop_tag(PT_BOOLEAN,     0x0023));
-define('PR_ORIGINATOR_RETURN_ADDRESS'                 ,mapi_prop_tag(PT_BINARY,      0x0024));
-
-define('PR_PARENT_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x0025));
-define('PR_PRIORITY'                                  ,mapi_prop_tag(PT_LONG,        0x0026));
-
-define('PR_ORIGIN_CHECK'                              ,mapi_prop_tag(PT_BINARY,      0x0027));
-define('PR_PROOF_OF_SUBMISSION_REQUESTED'             ,mapi_prop_tag(PT_BOOLEAN,     0x0028));
-define('PR_READ_RECEIPT_REQUESTED'                    ,mapi_prop_tag(PT_BOOLEAN,     0x0029));
-define('PR_RECEIPT_TIME'                              ,mapi_prop_tag(PT_SYSTIME,     0x002A));
-define('PR_RECIPIENT_REASSIGNMENT_PROHIBITED'         ,mapi_prop_tag(PT_BOOLEAN,     0x002B));
-define('PR_REDIRECTION_HISTORY'                       ,mapi_prop_tag(PT_BINARY,      0x002C));
-define('PR_RELATED_IPMS'                              ,mapi_prop_tag(PT_BINARY,      0x002D));
-define('PR_ORIGINAL_SENSITIVITY'                      ,mapi_prop_tag(PT_LONG,        0x002E));
-define('PR_LANGUAGES'                                 ,mapi_prop_tag(PT_TSTRING,     0x002F));
-define('PR_REPLY_TIME'                                ,mapi_prop_tag(PT_SYSTIME,     0x0030));
-define('PR_REPORT_TAG'                                ,mapi_prop_tag(PT_BINARY,      0x0031));
-define('PR_REPORT_TIME'                               ,mapi_prop_tag(PT_SYSTIME,     0x0032));
-define('PR_RETURNED_IPM'                              ,mapi_prop_tag(PT_BOOLEAN,     0x0033));
-define('PR_SECURITY'                                  ,mapi_prop_tag(PT_LONG,        0x0034));
-define('PR_INCOMPLETE_COPY'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0035));
-define('PR_SENSITIVITY'                               ,mapi_prop_tag(PT_LONG,        0x0036));
-define('PR_SUBJECT'                                   ,mapi_prop_tag(PT_TSTRING,     0x0037));
-define('PR_SUBJECT_IPM'                               ,mapi_prop_tag(PT_BINARY,      0x0038));
-define('PR_CLIENT_SUBMIT_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x0039));
-define('PR_REPORT_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x003A));
-define('PR_SENT_REPRESENTING_SEARCH_KEY'              ,mapi_prop_tag(PT_BINARY,      0x003B));
-define('PR_X400_CONTENT_TYPE'                         ,mapi_prop_tag(PT_BINARY,      0x003C));
-define('PR_SUBJECT_PREFIX'                            ,mapi_prop_tag(PT_TSTRING,     0x003D));
-define('PR_NON_RECEIPT_REASON'                        ,mapi_prop_tag(PT_LONG,        0x003E));
-define('PR_RECEIVED_BY_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x003F));
-define('PR_RECEIVED_BY_NAME'                          ,mapi_prop_tag(PT_TSTRING,     0x0040));
-define('PR_SENT_REPRESENTING_ENTRYID'                 ,mapi_prop_tag(PT_BINARY,      0x0041));
-define('PR_SENT_REPRESENTING_NAME'                    ,mapi_prop_tag(PT_TSTRING,     0x0042));
-define('PR_RCVD_REPRESENTING_ENTRYID'                 ,mapi_prop_tag(PT_BINARY,      0x0043));
-define('PR_RCVD_REPRESENTING_NAME'                    ,mapi_prop_tag(PT_TSTRING,     0x0044));
-define('PR_REPORT_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0045));
-define('PR_READ_RECEIPT_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x0046));
-define('PR_MESSAGE_SUBMISSION_ID'                     ,mapi_prop_tag(PT_BINARY,      0x0047));
-define('PR_PROVIDER_SUBMIT_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x0048));
-define('PR_ORIGINAL_SUBJECT'                          ,mapi_prop_tag(PT_TSTRING,     0x0049));
-define('PR_DISC_VAL'                                  ,mapi_prop_tag(PT_BOOLEAN,     0x004A));
-define('PR_ORIG_MESSAGE_CLASS'                        ,mapi_prop_tag(PT_TSTRING,     0x004B));
-define('PR_ORIGINAL_AUTHOR_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x004C));
-define('PR_ORIGINAL_AUTHOR_NAME'                      ,mapi_prop_tag(PT_TSTRING,     0x004D));
-define('PR_ORIGINAL_SUBMIT_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x004E));
-define('PR_REPLY_RECIPIENT_ENTRIES'                   ,mapi_prop_tag(PT_BINARY,      0x004F));
-define('PR_REPLY_RECIPIENT_NAMES'                     ,mapi_prop_tag(PT_TSTRING,     0x0050));
-
-define('PR_RECEIVED_BY_SEARCH_KEY'                    ,mapi_prop_tag(PT_BINARY,      0x0051));
-define('PR_RCVD_REPRESENTING_SEARCH_KEY'              ,mapi_prop_tag(PT_BINARY,      0x0052));
-define('PR_READ_RECEIPT_SEARCH_KEY'                   ,mapi_prop_tag(PT_BINARY,      0x0053));
-define('PR_REPORT_SEARCH_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x0054));
-define('PR_ORIGINAL_DELIVERY_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x0055));
-define('PR_ORIGINAL_AUTHOR_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x0056));
-
-define('PR_MESSAGE_TO_ME'                             ,mapi_prop_tag(PT_BOOLEAN,     0x0057));
-define('PR_MESSAGE_CC_ME'                             ,mapi_prop_tag(PT_BOOLEAN,     0x0058));
-define('PR_MESSAGE_RECIP_ME'                          ,mapi_prop_tag(PT_BOOLEAN,     0x0059));
-
-define('PR_ORIGINAL_SENDER_NAME'                      ,mapi_prop_tag(PT_TSTRING,     0x005A));
-define('PR_ORIGINAL_SENDER_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x005B));
-define('PR_ORIGINAL_SENDER_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x005C));
-define('PR_ORIGINAL_SENT_REPRESENTING_NAME'           ,mapi_prop_tag(PT_TSTRING,     0x005D));
-define('PR_ORIGINAL_SENT_REPRESENTING_ENTRYID'        ,mapi_prop_tag(PT_BINARY,      0x005E));
-define('PR_ORIGINAL_SENT_REPRESENTING_SEARCH_KEY'     ,mapi_prop_tag(PT_BINARY,      0x005F));
-
-define('PR_START_DATE'                                ,mapi_prop_tag(PT_SYSTIME,     0x0060));
-define('PR_END_DATE'                                  ,mapi_prop_tag(PT_SYSTIME,     0x0061));
-define('PR_OWNER_APPT_ID'                             ,mapi_prop_tag(PT_LONG,        0x0062));
-define('PR_RESPONSE_REQUESTED'                        ,mapi_prop_tag(PT_BOOLEAN,     0x0063));
-
-define('PR_SENT_REPRESENTING_ADDRTYPE'                ,mapi_prop_tag(PT_TSTRING,     0x0064));
-define('PR_SENT_REPRESENTING_EMAIL_ADDRESS'           ,mapi_prop_tag(PT_TSTRING,     0x0065));
-
-define('PR_ORIGINAL_SENDER_ADDRTYPE'                  ,mapi_prop_tag(PT_TSTRING,     0x0066));
-define('PR_ORIGINAL_SENDER_EMAIL_ADDRESS'             ,mapi_prop_tag(PT_TSTRING,     0x0067));
-
-define('PR_ORIGINAL_SENT_REPRESENTING_ADDRTYPE'       ,mapi_prop_tag(PT_TSTRING,     0x0068));
-define('PR_ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS'  ,mapi_prop_tag(PT_TSTRING,     0x0069));
-
-define('PR_CONVERSATION_TOPIC'                        ,mapi_prop_tag(PT_TSTRING,     0x0070));
-define('PR_CONVERSATION_INDEX'                        ,mapi_prop_tag(PT_BINARY,      0x0071));
-
-define('PR_ORIGINAL_DISPLAY_BCC'                      ,mapi_prop_tag(PT_TSTRING,     0x0072));
-define('PR_ORIGINAL_DISPLAY_CC'                       ,mapi_prop_tag(PT_TSTRING,     0x0073));
-define('PR_ORIGINAL_DISPLAY_TO'                       ,mapi_prop_tag(PT_TSTRING,     0x0074));
-
-define('PR_RECEIVED_BY_ADDRTYPE'                      ,mapi_prop_tag(PT_TSTRING,     0x0075));
-define('PR_RECEIVED_BY_EMAIL_ADDRESS'                 ,mapi_prop_tag(PT_TSTRING,     0x0076));
-
-define('PR_RCVD_REPRESENTING_ADDRTYPE'                ,mapi_prop_tag(PT_TSTRING,     0x0077));
-define('PR_RCVD_REPRESENTING_EMAIL_ADDRESS'           ,mapi_prop_tag(PT_TSTRING,     0x0078));
-
-define('PR_ORIGINAL_AUTHOR_ADDRTYPE'                  ,mapi_prop_tag(PT_TSTRING,     0x0079));
-define('PR_ORIGINAL_AUTHOR_EMAIL_ADDRESS'             ,mapi_prop_tag(PT_TSTRING,     0x007A));
-
-define('PR_ORIGINALLY_INTENDED_RECIP_ADDRTYPE'        ,mapi_prop_tag(PT_TSTRING,     0x007B));
-define('PR_ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS'   ,mapi_prop_tag(PT_TSTRING,     0x007C));
-
-define('PR_TRANSPORT_MESSAGE_HEADERS'                 ,mapi_prop_tag(PT_TSTRING,     0x007D));
-
-define('PR_DELEGATION'                                ,mapi_prop_tag(PT_BINARY,      0x007E));
-
-define('PR_TNEF_CORRELATION_KEY'                      ,mapi_prop_tag(PT_BINARY,      0x007F));
-
-define('PR_MDN_DISPOSITION_TYPE'                      ,mapi_prop_tag(PT_STRING8,     0x0080));
-define('PR_MDN_DISPOSITION_SENDINGMODE'               ,mapi_prop_tag(PT_STRING8,     0x0081));
-
-define('PR_USER_ENTRYID'                              ,mapi_prop_tag(PT_BINARY,      0x6619));
-define('PR_USER_NAME'                                 ,mapi_prop_tag(PT_STRING8,     0x661A));
-define('PR_MAILBOX_OWNER_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x661B));
-define('PR_MAILBOX_OWNER_NAME'                        ,mapi_prop_tag(PT_STRING8,     0x661C));
-
-define('PR_HIERARCHY_SYNCHRONIZER'                    ,mapi_prop_tag(PT_OBJECT,      0x662C));
-define('PR_CONTENTS_SYNCHRONIZER'                     ,mapi_prop_tag(PT_OBJECT,      0x662D));
-define('PR_COLLECTOR'                                 ,mapi_prop_tag(PT_OBJECT,      0x662E));
-
-define('PR_SMTP_ADDRESS'                              ,mapi_prop_tag(PT_TSTRING,     0x39FE));
+define('PR_ACKNOWLEDGEMENT_MODE', mapi_prop_tag(PT_LONG, 0x0001));
+define('PR_ALTERNATE_RECIPIENT_ALLOWED', mapi_prop_tag(PT_BOOLEAN, 0x0002));
+define('PR_AUTHORIZING_USERS', mapi_prop_tag(PT_BINARY, 0x0003));
+define('PR_AUTO_FORWARD_COMMENT', mapi_prop_tag(PT_TSTRING, 0x0004));
+define('PR_AUTO_FORWARDED', mapi_prop_tag(PT_BOOLEAN, 0x0005));
+define('PR_CONTENT_CONFIDENTIALITY_ALGORITHM_ID', mapi_prop_tag(PT_BINARY, 0x0006));
+define('PR_CONTENT_CORRELATOR', mapi_prop_tag(PT_BINARY, 0x0007));
+define('PR_CONTENT_IDENTIFIER', mapi_prop_tag(PT_TSTRING, 0x0008));
+define('PR_CONTENT_LENGTH', mapi_prop_tag(PT_LONG, 0x0009));
+define('PR_CONTENT_RETURN_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x000A));
+
+
+
+define('PR_CONVERSATION_KEY', mapi_prop_tag(PT_BINARY, 0x000B));
+
+define('PR_CONVERSION_EITS', mapi_prop_tag(PT_BINARY, 0x000C));
+define('PR_CONVERSION_WITH_LOSS_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x000D));
+define('PR_CONVERTED_EITS', mapi_prop_tag(PT_BINARY, 0x000E));
+define('PR_DEFERRED_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x000F));
+define('PR_DEFERRED_SEND_TIME', mapi_prop_tag(PT_SYSTIME, 0x3FEF));
+define('PR_DELIVER_TIME', mapi_prop_tag(PT_SYSTIME, 0x0010));
+define('PR_DISCARD_REASON', mapi_prop_tag(PT_LONG, 0x0011));
+define('PR_DISCLOSURE_OF_RECIPIENTS', mapi_prop_tag(PT_BOOLEAN, 0x0012));
+define('PR_DL_EXPANSION_HISTORY', mapi_prop_tag(PT_BINARY, 0x0013));
+define('PR_DL_EXPANSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0014));
+define('PR_EXPIRY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0015));
+define('PR_IMPLICIT_CONVERSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0016));
+define('PR_IMPORTANCE', mapi_prop_tag(PT_LONG, 0x0017));
+define('PR_IPM_ID', mapi_prop_tag(PT_BINARY, 0x0018));
+define('PR_LATEST_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0019));
+define('PR_MESSAGE_CLASS', mapi_prop_tag(PT_TSTRING, 0x001A));
+define('PR_MESSAGE_DELIVERY_ID', mapi_prop_tag(PT_BINARY, 0x001B));
+
+
+
+
+
+define('PR_MESSAGE_SECURITY_LABEL', mapi_prop_tag(PT_BINARY, 0x001E));
+define('PR_OBSOLETED_IPMS', mapi_prop_tag(PT_BINARY, 0x001F));
+define('PR_ORIGINALLY_INTENDED_RECIPIENT_NAME', mapi_prop_tag(PT_BINARY, 0x0020));
+define('PR_ORIGINAL_EITS', mapi_prop_tag(PT_BINARY, 0x0021));
+define('PR_ORIGINATOR_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0022));
+define('PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0023));
+define('PR_ORIGINATOR_RETURN_ADDRESS', mapi_prop_tag(PT_BINARY, 0x0024));
+
+define('PR_PARENT_KEY', mapi_prop_tag(PT_BINARY, 0x0025));
+define('PR_PRIORITY', mapi_prop_tag(PT_LONG, 0x0026));
+
+define('PR_ORIGIN_CHECK', mapi_prop_tag(PT_BINARY, 0x0027));
+define('PR_PROOF_OF_SUBMISSION_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0028));
+define('PR_READ_RECEIPT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0029));
+define('PR_RECEIPT_TIME', mapi_prop_tag(PT_SYSTIME, 0x002A));
+define('PR_RECIPIENT_REASSIGNMENT_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x002B));
+define('PR_REDIRECTION_HISTORY', mapi_prop_tag(PT_BINARY, 0x002C));
+define('PR_RELATED_IPMS', mapi_prop_tag(PT_BINARY, 0x002D));
+define('PR_ORIGINAL_SENSITIVITY', mapi_prop_tag(PT_LONG, 0x002E));
+define('PR_LANGUAGES', mapi_prop_tag(PT_TSTRING, 0x002F));
+define('PR_REPLY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0030));
+define('PR_REPORT_TAG', mapi_prop_tag(PT_BINARY, 0x0031));
+define('PR_REPORT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0032));
+define('PR_RETURNED_IPM', mapi_prop_tag(PT_BOOLEAN, 0x0033));
+define('PR_SECURITY', mapi_prop_tag(PT_LONG, 0x0034));
+define('PR_INCOMPLETE_COPY', mapi_prop_tag(PT_BOOLEAN, 0x0035));
+define('PR_SENSITIVITY', mapi_prop_tag(PT_LONG, 0x0036));
+define('PR_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0037));
+define('PR_SUBJECT_IPM', mapi_prop_tag(PT_BINARY, 0x0038));
+define('PR_CLIENT_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0039));
+define('PR_REPORT_NAME', mapi_prop_tag(PT_TSTRING, 0x003A));
+define('PR_SENT_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x003B));
+define('PR_X400_CONTENT_TYPE', mapi_prop_tag(PT_BINARY, 0x003C));
+define('PR_SUBJECT_PREFIX', mapi_prop_tag(PT_TSTRING, 0x003D));
+define('PR_NON_RECEIPT_REASON', mapi_prop_tag(PT_LONG, 0x003E));
+define('PR_RECEIVED_BY_ENTRYID', mapi_prop_tag(PT_BINARY, 0x003F));
+define('PR_RECEIVED_BY_NAME', mapi_prop_tag(PT_TSTRING, 0x0040));
+define('PR_SENT_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0041));
+define('PR_SENT_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x0042));
+define('PR_RCVD_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0043));
+define('PR_RCVD_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x0044));
+define('PR_REPORT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0045));
+define('PR_READ_RECEIPT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0046));
+define('PR_MESSAGE_SUBMISSION_ID', mapi_prop_tag(PT_BINARY, 0x0047));
+define('PR_PROVIDER_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0048));
+define('PR_ORIGINAL_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0049));
+define('PR_DISC_VAL', mapi_prop_tag(PT_BOOLEAN, 0x004A));
+define('PR_ORIG_MESSAGE_CLASS', mapi_prop_tag(PT_TSTRING, 0x004B));
+define('PR_ORIGINAL_AUTHOR_ENTRYID', mapi_prop_tag(PT_BINARY, 0x004C));
+define('PR_ORIGINAL_AUTHOR_NAME', mapi_prop_tag(PT_TSTRING, 0x004D));
+define('PR_ORIGINAL_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x004E));
+define('PR_REPLY_RECIPIENT_ENTRIES', mapi_prop_tag(PT_BINARY, 0x004F));
+define('PR_REPLY_RECIPIENT_NAMES', mapi_prop_tag(PT_TSTRING, 0x0050));
+
+define('PR_RECEIVED_BY_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0051));
+define('PR_RCVD_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0052));
+define('PR_READ_RECEIPT_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0053));
+define('PR_REPORT_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0054));
+define('PR_ORIGINAL_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0055));
+define('PR_ORIGINAL_AUTHOR_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0056));
+
+define('PR_MESSAGE_TO_ME', mapi_prop_tag(PT_BOOLEAN, 0x0057));
+define('PR_MESSAGE_CC_ME', mapi_prop_tag(PT_BOOLEAN, 0x0058));
+define('PR_MESSAGE_RECIP_ME', mapi_prop_tag(PT_BOOLEAN, 0x0059));
+
+define('PR_ORIGINAL_SENDER_NAME', mapi_prop_tag(PT_TSTRING, 0x005A));
+define('PR_ORIGINAL_SENDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x005B));
+define('PR_ORIGINAL_SENDER_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x005C));
+define('PR_ORIGINAL_SENT_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x005D));
+define('PR_ORIGINAL_SENT_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x005E));
+define('PR_ORIGINAL_SENT_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x005F));
+
+define('PR_START_DATE', mapi_prop_tag(PT_SYSTIME, 0x0060));
+define('PR_END_DATE', mapi_prop_tag(PT_SYSTIME, 0x0061));
+define('PR_OWNER_APPT_ID', mapi_prop_tag(PT_LONG, 0x0062));
+define('PR_RESPONSE_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0063));
+
+define('PR_SENT_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0064));
+define('PR_SENT_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0065));
+
+define('PR_ORIGINAL_SENDER_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0066));
+define('PR_ORIGINAL_SENDER_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0067));
+
+define('PR_ORIGINAL_SENT_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0068));
+define('PR_ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0069));
+
+define('PR_CONVERSATION_TOPIC', mapi_prop_tag(PT_TSTRING, 0x0070));
+define('PR_CONVERSATION_INDEX', mapi_prop_tag(PT_BINARY, 0x0071));
+
+define('PR_ORIGINAL_DISPLAY_BCC', mapi_prop_tag(PT_TSTRING, 0x0072));
+define('PR_ORIGINAL_DISPLAY_CC', mapi_prop_tag(PT_TSTRING, 0x0073));
+define('PR_ORIGINAL_DISPLAY_TO', mapi_prop_tag(PT_TSTRING, 0x0074));
+
+define('PR_RECEIVED_BY_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0075));
+define('PR_RECEIVED_BY_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0076));
+
+define('PR_RCVD_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0077));
+define('PR_RCVD_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0078));
+
+define('PR_ORIGINAL_AUTHOR_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0079));
+define('PR_ORIGINAL_AUTHOR_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x007A));
+
+define('PR_ORIGINALLY_INTENDED_RECIP_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x007B));
+define('PR_ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x007C));
+
+define('PR_TRANSPORT_MESSAGE_HEADERS', mapi_prop_tag(PT_TSTRING, 0x007D));
+
+define('PR_DELEGATION', mapi_prop_tag(PT_BINARY, 0x007E));
+
+define('PR_TNEF_CORRELATION_KEY', mapi_prop_tag(PT_BINARY, 0x007F));
+
+define('PR_MDN_DISPOSITION_TYPE', mapi_prop_tag(PT_STRING8, 0x0080));
+define('PR_MDN_DISPOSITION_SENDINGMODE', mapi_prop_tag(PT_STRING8, 0x0081));
+
+define('PR_USER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6619));
+define('PR_USER_NAME', mapi_prop_tag(PT_STRING8, 0x661A));
+define('PR_MAILBOX_OWNER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x661B));
+define('PR_MAILBOX_OWNER_NAME', mapi_prop_tag(PT_STRING8, 0x661C));
+
+define('PR_HIERARCHY_SYNCHRONIZER', mapi_prop_tag(PT_OBJECT, 0x662C));
+define('PR_CONTENTS_SYNCHRONIZER', mapi_prop_tag(PT_OBJECT, 0x662D));
+define('PR_COLLECTOR', mapi_prop_tag(PT_OBJECT, 0x662E));
+
+define('PR_SMTP_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x39FE));
 
 /*
  *  Message content properties
  */
 
-define('PR_BODY'                                      ,mapi_prop_tag(PT_TSTRING,     0x1000));
-define('PR_HTML'                                      ,mapi_prop_tag(PT_BINARY,      0x1013));
-define('PR_REPORT_TEXT'                               ,mapi_prop_tag(PT_TSTRING,     0x1001));
-define('PR_ORIGINATOR_AND_DL_EXPANSION_HISTORY'       ,mapi_prop_tag(PT_BINARY,      0x1002));
-define('PR_REPORTING_DL_NAME'                         ,mapi_prop_tag(PT_BINARY,      0x1003));
-define('PR_REPORTING_MTA_CERTIFICATE'                 ,mapi_prop_tag(PT_BINARY,      0x1004));
+define('PR_BODY', mapi_prop_tag(PT_TSTRING, 0x1000));
+define('PR_HTML', mapi_prop_tag(PT_BINARY, 0x1013));
+define('PR_REPORT_TEXT', mapi_prop_tag(PT_TSTRING, 0x1001));
+define('PR_ORIGINATOR_AND_DL_EXPANSION_HISTORY', mapi_prop_tag(PT_BINARY, 0x1002));
+define('PR_REPORTING_DL_NAME', mapi_prop_tag(PT_BINARY, 0x1003));
+define('PR_REPORTING_MTA_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x1004));
 
 /*  Removed 'PR_REPORT_ORIGIN_AUTHENTICATION_CHECK with DCR 3865, use 'PR_ORIGIN_CHECK */
 
-define('PR_RTF_SYNC_BODY_CRC'                         ,mapi_prop_tag(PT_LONG,        0x1006));
-define('PR_RTF_SYNC_BODY_COUNT'                       ,mapi_prop_tag(PT_LONG,        0x1007));
-define('PR_RTF_SYNC_BODY_TAG'                         ,mapi_prop_tag(PT_TSTRING,     0x1008));
-define('PR_RTF_COMPRESSED'                            ,mapi_prop_tag(PT_BINARY,      0x1009));
-define('PR_RTF_SYNC_PREFIX_COUNT'                     ,mapi_prop_tag(PT_LONG,        0x1010));
-define('PR_RTF_SYNC_TRAILING_COUNT'                   ,mapi_prop_tag(PT_LONG,        0x1011));
-define('PR_ORIGINALLY_INTENDED_RECIP_ENTRYID'         ,mapi_prop_tag(PT_BINARY,      0x1012));
-define('PR_NATIVE_BODY_INFO'                          ,mapi_prop_tag(PT_LONG,        0x1016));
+define('PR_RTF_SYNC_BODY_CRC', mapi_prop_tag(PT_LONG, 0x1006));
+define('PR_RTF_SYNC_BODY_COUNT', mapi_prop_tag(PT_LONG, 0x1007));
+define('PR_RTF_SYNC_BODY_TAG', mapi_prop_tag(PT_TSTRING, 0x1008));
+define('PR_RTF_COMPRESSED', mapi_prop_tag(PT_BINARY, 0x1009));
+define('PR_RTF_SYNC_PREFIX_COUNT', mapi_prop_tag(PT_LONG, 0x1010));
+define('PR_RTF_SYNC_TRAILING_COUNT', mapi_prop_tag(PT_LONG, 0x1011));
+define('PR_ORIGINALLY_INTENDED_RECIP_ENTRYID', mapi_prop_tag(PT_BINARY, 0x1012));
+define('PR_NATIVE_BODY_INFO', mapi_prop_tag(PT_LONG, 0x1016));
 
-define('PR_CONFLICT_ITEMS'                            ,mapi_prop_tag(PT_MV_BINARY,   0x1098));
+define('PR_CONFLICT_ITEMS', mapi_prop_tag(PT_MV_BINARY, 0x1098));
 
 /*
  *  Reserved 0x1100-0x1200
@@ -203,39 +203,39 @@ 
  *  Message recipient properties
  */
 
-define('PR_CONTENT_INTEGRITY_CHECK'                   ,mapi_prop_tag(PT_BINARY,      0x0C00));
-define('PR_EXPLICIT_CONVERSION'                       ,mapi_prop_tag(PT_LONG,        0x0C01));
-define('PR_IPM_RETURN_REQUESTED'                      ,mapi_prop_tag(PT_BOOLEAN,     0x0C02));
-define('PR_MESSAGE_TOKEN'                             ,mapi_prop_tag(PT_BINARY,      0x0C03));
-define('PR_NDR_REASON_CODE'                           ,mapi_prop_tag(PT_LONG,        0x0C04));
-define('PR_NDR_DIAG_CODE'                             ,mapi_prop_tag(PT_LONG,        0x0C05));
-define('PR_NON_RECEIPT_NOTIFICATION_REQUESTED'        ,mapi_prop_tag(PT_BOOLEAN,     0x0C06));
-define('PR_DELIVERY_POINT'                            ,mapi_prop_tag(PT_LONG,        0x0C07));
-
-define('PR_ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED'  ,mapi_prop_tag(PT_BOOLEAN,     0x0C08));
-define('PR_ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT'  ,mapi_prop_tag(PT_BINARY,      0x0C09));
-define('PR_PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY'     ,mapi_prop_tag(PT_BOOLEAN,     0x0C0A));
-define('PR_PHYSICAL_DELIVERY_MODE'                    ,mapi_prop_tag(PT_LONG,        0x0C0B));
-define('PR_PHYSICAL_DELIVERY_REPORT_REQUEST'          ,mapi_prop_tag(PT_LONG,        0x0C0C));
-define('PR_PHYSICAL_FORWARDING_ADDRESS'               ,mapi_prop_tag(PT_BINARY,      0x0C0D));
-define('PR_PHYSICAL_FORWARDING_ADDRESS_REQUESTED'     ,mapi_prop_tag(PT_BOOLEAN,     0x0C0E));
-define('PR_PHYSICAL_FORWARDING_PROHIBITED'            ,mapi_prop_tag(PT_BOOLEAN,     0x0C0F));
-define('PR_PHYSICAL_RENDITION_ATTRIBUTES'             ,mapi_prop_tag(PT_BINARY,      0x0C10));
-define('PR_PROOF_OF_DELIVERY'                         ,mapi_prop_tag(PT_BINARY,      0x0C11));
-define('PR_PROOF_OF_DELIVERY_REQUESTED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0C12));
-define('PR_RECIPIENT_CERTIFICATE'                     ,mapi_prop_tag(PT_BINARY,      0x0C13));
-define('PR_RECIPIENT_NUMBER_FOR_ADVICE'               ,mapi_prop_tag(PT_TSTRING,     0x0C14));
-define('PR_RECIPIENT_TYPE'                            ,mapi_prop_tag(PT_LONG,        0x0C15));
-define('PR_REGISTERED_MAIL_TYPE'                      ,mapi_prop_tag(PT_LONG,        0x0C16));
-define('PR_REPLY_REQUESTED'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0C17));
-define('PR_REQUESTED_DELIVERY_METHOD'                 ,mapi_prop_tag(PT_LONG,        0x0C18));
-define('PR_SENDER_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0C19));
-define('PR_SENDER_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x0C1A));
-define('PR_SUPPLEMENTARY_INFO'                        ,mapi_prop_tag(PT_TSTRING,     0x0C1B));
-define('PR_TYPE_OF_MTS_USER'                          ,mapi_prop_tag(PT_LONG,        0x0C1C));
-define('PR_SENDER_SEARCH_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x0C1D));
-define('PR_SENDER_ADDRTYPE'                           ,mapi_prop_tag(PT_TSTRING,     0x0C1E));
-define('PR_SENDER_EMAIL_ADDRESS'                      ,mapi_prop_tag(PT_TSTRING,     0x0C1F));
+define('PR_CONTENT_INTEGRITY_CHECK', mapi_prop_tag(PT_BINARY, 0x0C00));
+define('PR_EXPLICIT_CONVERSION', mapi_prop_tag(PT_LONG, 0x0C01));
+define('PR_IPM_RETURN_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C02));
+define('PR_MESSAGE_TOKEN', mapi_prop_tag(PT_BINARY, 0x0C03));
+define('PR_NDR_REASON_CODE', mapi_prop_tag(PT_LONG, 0x0C04));
+define('PR_NDR_DIAG_CODE', mapi_prop_tag(PT_LONG, 0x0C05));
+define('PR_NON_RECEIPT_NOTIFICATION_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C06));
+define('PR_DELIVERY_POINT', mapi_prop_tag(PT_LONG, 0x0C07));
+
+define('PR_ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C08));
+define('PR_ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT', mapi_prop_tag(PT_BINARY, 0x0C09));
+define('PR_PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY', mapi_prop_tag(PT_BOOLEAN, 0x0C0A));
+define('PR_PHYSICAL_DELIVERY_MODE', mapi_prop_tag(PT_LONG, 0x0C0B));
+define('PR_PHYSICAL_DELIVERY_REPORT_REQUEST', mapi_prop_tag(PT_LONG, 0x0C0C));
+define('PR_PHYSICAL_FORWARDING_ADDRESS', mapi_prop_tag(PT_BINARY, 0x0C0D));
+define('PR_PHYSICAL_FORWARDING_ADDRESS_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C0E));
+define('PR_PHYSICAL_FORWARDING_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0C0F));
+define('PR_PHYSICAL_RENDITION_ATTRIBUTES', mapi_prop_tag(PT_BINARY, 0x0C10));
+define('PR_PROOF_OF_DELIVERY', mapi_prop_tag(PT_BINARY, 0x0C11));
+define('PR_PROOF_OF_DELIVERY_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C12));
+define('PR_RECIPIENT_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0C13));
+define('PR_RECIPIENT_NUMBER_FOR_ADVICE', mapi_prop_tag(PT_TSTRING, 0x0C14));
+define('PR_RECIPIENT_TYPE', mapi_prop_tag(PT_LONG, 0x0C15));
+define('PR_REGISTERED_MAIL_TYPE', mapi_prop_tag(PT_LONG, 0x0C16));
+define('PR_REPLY_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C17));
+define('PR_REQUESTED_DELIVERY_METHOD', mapi_prop_tag(PT_LONG, 0x0C18));
+define('PR_SENDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0C19));
+define('PR_SENDER_NAME', mapi_prop_tag(PT_TSTRING, 0x0C1A));
+define('PR_SUPPLEMENTARY_INFO', mapi_prop_tag(PT_TSTRING, 0x0C1B));
+define('PR_TYPE_OF_MTS_USER', mapi_prop_tag(PT_LONG, 0x0C1C));
+define('PR_SENDER_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0C1D));
+define('PR_SENDER_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0C1E));
+define('PR_SENDER_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0C1F));
 
 /*
  *  Message non-transmittable properties
@@ -249,47 +249,47 @@ 
  * return from IMessage::CopyTo when an error is encountered copying them
  */
 
-define('PR_CURRENT_VERSION'                           ,mapi_prop_tag(PT_I8,          0x0E00));
-define('PR_DELETE_AFTER_SUBMIT'                       ,mapi_prop_tag(PT_BOOLEAN,     0x0E01));
-define('PR_DISPLAY_BCC'                               ,mapi_prop_tag(PT_TSTRING,     0x0E02));
-define('PR_DISPLAY_CC'                                ,mapi_prop_tag(PT_TSTRING,     0x0E03));
-define('PR_DISPLAY_TO'                                ,mapi_prop_tag(PT_TSTRING,     0x0E04));
-define('PR_PARENT_DISPLAY'                            ,mapi_prop_tag(PT_TSTRING,     0x0E05));
-define('PR_MESSAGE_DELIVERY_TIME'                     ,mapi_prop_tag(PT_SYSTIME,     0x0E06));
-define('PR_MESSAGE_FLAGS'                             ,mapi_prop_tag(PT_LONG,        0x0E07));
-define('PR_MESSAGE_SIZE'                              ,mapi_prop_tag(PT_LONG,        0x0E08));
-define('PR_MESSAGE_SIZE_EXTENDED'                     ,mapi_prop_tag(PT_LONGLONG,    0x0E08));
-define('PR_PARENT_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0E09));
-define('PR_SENTMAIL_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x0E0A));
-define('PR_CORRELATE'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x0E0C));
-define('PR_CORRELATE_MTSID'                           ,mapi_prop_tag(PT_BINARY,      0x0E0D));
-define('PR_DISCRETE_VALUES'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0E0E));
-define('PR_RESPONSIBILITY'                            ,mapi_prop_tag(PT_BOOLEAN,     0x0E0F));
-define('PR_SPOOLER_STATUS'                            ,mapi_prop_tag(PT_LONG,        0x0E10));
-define('PR_TRANSPORT_STATUS'                          ,mapi_prop_tag(PT_LONG,        0x0E11));
-define('PR_MESSAGE_RECIPIENTS'                        ,mapi_prop_tag(PT_OBJECT,      0x0E12));
-define('PR_MESSAGE_ATTACHMENTS'                       ,mapi_prop_tag(PT_OBJECT,      0x0E13));
-define('PR_SUBMIT_FLAGS'                              ,mapi_prop_tag(PT_LONG,        0x0E14));
-define('PR_RECIPIENT_STATUS'                          ,mapi_prop_tag(PT_LONG,        0x0E15));
-define('PR_TRANSPORT_KEY'                             ,mapi_prop_tag(PT_LONG,        0x0E16));
-define('PR_MSG_STATUS'                                ,mapi_prop_tag(PT_LONG,        0x0E17));
-define('PR_MESSAGE_DOWNLOAD_TIME'                     ,mapi_prop_tag(PT_LONG,        0x0E18));
-define('PR_CREATION_VERSION'                          ,mapi_prop_tag(PT_I8,          0x0E19));
-define('PR_MODIFY_VERSION'                            ,mapi_prop_tag(PT_I8,          0x0E1A));
-define('PR_HASATTACH'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x0E1B));
-define('PR_BODY_CRC'                                  ,mapi_prop_tag(PT_LONG,        0x0E1C));
-define('PR_NORMALIZED_SUBJECT'                        ,mapi_prop_tag(PT_TSTRING,     0x0E1D));
-define('PR_RTF_IN_SYNC'                               ,mapi_prop_tag(PT_BOOLEAN,     0x0E1F));
-define('PR_ATTACH_SIZE'                               ,mapi_prop_tag(PT_LONG,        0x0E20));
-define('PR_ATTACH_NUM'                                ,mapi_prop_tag(PT_LONG,        0x0E21));
-define('PR_PREPROCESS'                                ,mapi_prop_tag(PT_BOOLEAN,     0x0E22));
+define('PR_CURRENT_VERSION', mapi_prop_tag(PT_I8, 0x0E00));
+define('PR_DELETE_AFTER_SUBMIT', mapi_prop_tag(PT_BOOLEAN, 0x0E01));
+define('PR_DISPLAY_BCC', mapi_prop_tag(PT_TSTRING, 0x0E02));
+define('PR_DISPLAY_CC', mapi_prop_tag(PT_TSTRING, 0x0E03));
+define('PR_DISPLAY_TO', mapi_prop_tag(PT_TSTRING, 0x0E04));
+define('PR_PARENT_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x0E05));
+define('PR_MESSAGE_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0E06));
+define('PR_MESSAGE_FLAGS', mapi_prop_tag(PT_LONG, 0x0E07));
+define('PR_MESSAGE_SIZE', mapi_prop_tag(PT_LONG, 0x0E08));
+define('PR_MESSAGE_SIZE_EXTENDED', mapi_prop_tag(PT_LONGLONG, 0x0E08));
+define('PR_PARENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0E09));
+define('PR_SENTMAIL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0E0A));
+define('PR_CORRELATE', mapi_prop_tag(PT_BOOLEAN, 0x0E0C));
+define('PR_CORRELATE_MTSID', mapi_prop_tag(PT_BINARY, 0x0E0D));
+define('PR_DISCRETE_VALUES', mapi_prop_tag(PT_BOOLEAN, 0x0E0E));
+define('PR_RESPONSIBILITY', mapi_prop_tag(PT_BOOLEAN, 0x0E0F));
+define('PR_SPOOLER_STATUS', mapi_prop_tag(PT_LONG, 0x0E10));
+define('PR_TRANSPORT_STATUS', mapi_prop_tag(PT_LONG, 0x0E11));
+define('PR_MESSAGE_RECIPIENTS', mapi_prop_tag(PT_OBJECT, 0x0E12));
+define('PR_MESSAGE_ATTACHMENTS', mapi_prop_tag(PT_OBJECT, 0x0E13));
+define('PR_SUBMIT_FLAGS', mapi_prop_tag(PT_LONG, 0x0E14));
+define('PR_RECIPIENT_STATUS', mapi_prop_tag(PT_LONG, 0x0E15));
+define('PR_TRANSPORT_KEY', mapi_prop_tag(PT_LONG, 0x0E16));
+define('PR_MSG_STATUS', mapi_prop_tag(PT_LONG, 0x0E17));
+define('PR_MESSAGE_DOWNLOAD_TIME', mapi_prop_tag(PT_LONG, 0x0E18));
+define('PR_CREATION_VERSION', mapi_prop_tag(PT_I8, 0x0E19));
+define('PR_MODIFY_VERSION', mapi_prop_tag(PT_I8, 0x0E1A));
+define('PR_HASATTACH', mapi_prop_tag(PT_BOOLEAN, 0x0E1B));
+define('PR_BODY_CRC', mapi_prop_tag(PT_LONG, 0x0E1C));
+define('PR_NORMALIZED_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0E1D));
+define('PR_RTF_IN_SYNC', mapi_prop_tag(PT_BOOLEAN, 0x0E1F));
+define('PR_ATTACH_SIZE', mapi_prop_tag(PT_LONG, 0x0E20));
+define('PR_ATTACH_NUM', mapi_prop_tag(PT_LONG, 0x0E21));
+define('PR_PREPROCESS', mapi_prop_tag(PT_BOOLEAN, 0x0E22));
 
 /* 'PR_ORIGINAL_DISPLAY_TO, _CC, and _BCC moved to transmittible range 03/09/95 */
 
-define('PR_ORIGINATING_MTA_CERTIFICATE'               ,mapi_prop_tag(PT_BINARY,      0x0E25));
-define('PR_PROOF_OF_SUBMISSION'                       ,mapi_prop_tag(PT_BINARY,      0x0E26));
+define('PR_ORIGINATING_MTA_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0E25));
+define('PR_PROOF_OF_SUBMISSION', mapi_prop_tag(PT_BINARY, 0x0E26));
 
-define('PR_TODO_ITEM_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x0E2B));
+define('PR_TODO_ITEM_FLAGS', mapi_prop_tag(PT_LONG, 0x0E2B));
 
 /*
  * The range of non-message and non-recipient property IDs (0x3000 - 0x3FFF)); is
@@ -326,80 +326,80 @@ 
  * -- these ids are in the non-transmittable range
  */
 
-define('PR_ENTRYID'                                   ,mapi_prop_tag(PT_BINARY,      0x0FFF));
-define('PR_OBJECT_TYPE'                               ,mapi_prop_tag(PT_LONG,        0x0FFE));
-define('PR_ICON'                                      ,mapi_prop_tag(PT_BINARY,      0x0FFD));
-define('PR_MINI_ICON'                                 ,mapi_prop_tag(PT_BINARY,      0x0FFC));
-define('PR_STORE_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x0FFB));
-define('PR_STORE_RECORD_KEY'                          ,mapi_prop_tag(PT_BINARY,      0x0FFA));
-define('PR_RECORD_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x0FF9));
-define('PR_MAPPING_SIGNATURE'                         ,mapi_prop_tag(PT_BINARY,      0x0FF8));
-define('PR_ACCESS_LEVEL'                              ,mapi_prop_tag(PT_LONG,        0x0FF7));
-define('PR_INSTANCE_KEY'                              ,mapi_prop_tag(PT_BINARY,      0x0FF6));
-define('PR_ROW_TYPE'                                  ,mapi_prop_tag(PT_LONG,        0x0FF5));
-define('PR_ACCESS'                                    ,mapi_prop_tag(PT_LONG,        0x0FF4));
+define('PR_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0FFF));
+define('PR_OBJECT_TYPE', mapi_prop_tag(PT_LONG, 0x0FFE));
+define('PR_ICON', mapi_prop_tag(PT_BINARY, 0x0FFD));
+define('PR_MINI_ICON', mapi_prop_tag(PT_BINARY, 0x0FFC));
+define('PR_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0FFB));
+define('PR_STORE_RECORD_KEY', mapi_prop_tag(PT_BINARY, 0x0FFA));
+define('PR_RECORD_KEY', mapi_prop_tag(PT_BINARY, 0x0FF9));
+define('PR_MAPPING_SIGNATURE', mapi_prop_tag(PT_BINARY, 0x0FF8));
+define('PR_ACCESS_LEVEL', mapi_prop_tag(PT_LONG, 0x0FF7));
+define('PR_INSTANCE_KEY', mapi_prop_tag(PT_BINARY, 0x0FF6));
+define('PR_ROW_TYPE', mapi_prop_tag(PT_LONG, 0x0FF5));
+define('PR_ACCESS', mapi_prop_tag(PT_LONG, 0x0FF4));
 
 /*
  * properties that are common to multiple objects (usually not including message objects));
  * -- these ids are in the transmittable range
  */
 
-define('PR_ROWID'                                     ,mapi_prop_tag(PT_LONG,        0x3000));
-define('PR_DISPLAY_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3001));
-define('PR_DISPLAY_NAME_W'                            ,mapi_prop_tag(PT_UNICODE,     0x3001));
-define('PR_ADDRTYPE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3002));
-define('PR_EMAIL_ADDRESS'                             ,mapi_prop_tag(PT_TSTRING,     0x3003));
-define('PR_COMMENT'                                   ,mapi_prop_tag(PT_TSTRING,     0x3004));
-define('PR_DEPTH'                                     ,mapi_prop_tag(PT_LONG,        0x3005));
-define('PR_PROVIDER_DISPLAY'                          ,mapi_prop_tag(PT_TSTRING,     0x3006));
-define('PR_CREATION_TIME'                             ,mapi_prop_tag(PT_SYSTIME,     0x3007));
-define('PR_LAST_MODIFICATION_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x3008));
-define('PR_RESOURCE_FLAGS'                            ,mapi_prop_tag(PT_LONG,        0x3009));
-define('PR_PROVIDER_DLL_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x300A));
-define('PR_SEARCH_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x300B));
-define('PR_PROVIDER_UID'                              ,mapi_prop_tag(PT_BINARY,      0x300C));
-define('PR_PROVIDER_ORDINAL'                          ,mapi_prop_tag(PT_LONG,        0x300D));
+define('PR_ROWID', mapi_prop_tag(PT_LONG, 0x3000));
+define('PR_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3001));
+define('PR_DISPLAY_NAME_W', mapi_prop_tag(PT_UNICODE, 0x3001));
+define('PR_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x3002));
+define('PR_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3003));
+define('PR_COMMENT', mapi_prop_tag(PT_TSTRING, 0x3004));
+define('PR_DEPTH', mapi_prop_tag(PT_LONG, 0x3005));
+define('PR_PROVIDER_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x3006));
+define('PR_CREATION_TIME', mapi_prop_tag(PT_SYSTIME, 0x3007));
+define('PR_LAST_MODIFICATION_TIME', mapi_prop_tag(PT_SYSTIME, 0x3008));
+define('PR_RESOURCE_FLAGS', mapi_prop_tag(PT_LONG, 0x3009));
+define('PR_PROVIDER_DLL_NAME', mapi_prop_tag(PT_TSTRING, 0x300A));
+define('PR_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x300B));
+define('PR_PROVIDER_UID', mapi_prop_tag(PT_BINARY, 0x300C));
+define('PR_PROVIDER_ORDINAL', mapi_prop_tag(PT_LONG, 0x300D));
 
 /*
  *  MAPI Form properties
  */
-define('PR_FORM_VERSION'                              ,mapi_prop_tag(PT_TSTRING,     0x3301));
-define('PR_FORM_CLSID'                                ,mapi_prop_tag(PT_CLSID,       0x3302));
-define('PR_FORM_CONTACT_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x3303));
-define('PR_FORM_CATEGORY'                             ,mapi_prop_tag(PT_TSTRING,     0x3304));
-define('PR_FORM_CATEGORY_SUB'                         ,mapi_prop_tag(PT_TSTRING,     0x3305));
-define('PR_FORM_HOST_MAP'                             ,mapi_prop_tag(PT_MV_LONG,     0x3306));
-define('PR_FORM_HIDDEN'                               ,mapi_prop_tag(PT_BOOLEAN,     0x3307));
-define('PR_FORM_DESIGNER_NAME'                        ,mapi_prop_tag(PT_TSTRING,     0x3308));
-define('PR_FORM_DESIGNER_GUID'                        ,mapi_prop_tag(PT_CLSID,       0x3309));
-define('PR_FORM_MESSAGE_BEHAVIOR'                     ,mapi_prop_tag(PT_LONG,        0x330A));
+define('PR_FORM_VERSION', mapi_prop_tag(PT_TSTRING, 0x3301));
+define('PR_FORM_CLSID', mapi_prop_tag(PT_CLSID, 0x3302));
+define('PR_FORM_CONTACT_NAME', mapi_prop_tag(PT_TSTRING, 0x3303));
+define('PR_FORM_CATEGORY', mapi_prop_tag(PT_TSTRING, 0x3304));
+define('PR_FORM_CATEGORY_SUB', mapi_prop_tag(PT_TSTRING, 0x3305));
+define('PR_FORM_HOST_MAP', mapi_prop_tag(PT_MV_LONG, 0x3306));
+define('PR_FORM_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x3307));
+define('PR_FORM_DESIGNER_NAME', mapi_prop_tag(PT_TSTRING, 0x3308));
+define('PR_FORM_DESIGNER_GUID', mapi_prop_tag(PT_CLSID, 0x3309));
+define('PR_FORM_MESSAGE_BEHAVIOR', mapi_prop_tag(PT_LONG, 0x330A));
 
 /*
  *  Message store properties
  */
 
-define('PR_DEFAULT_STORE'                             ,mapi_prop_tag(PT_BOOLEAN,     0x3400));
-define('PR_STORE_SUPPORT_MASK'                        ,mapi_prop_tag(PT_LONG,        0x340D));
-define('PR_STORE_STATE'                               ,mapi_prop_tag(PT_LONG,        0x340E));
+define('PR_DEFAULT_STORE', mapi_prop_tag(PT_BOOLEAN, 0x3400));
+define('PR_STORE_SUPPORT_MASK', mapi_prop_tag(PT_LONG, 0x340D));
+define('PR_STORE_STATE', mapi_prop_tag(PT_LONG, 0x340E));
 
-define('PR_IPM_SUBTREE_SEARCH_KEY'                    ,mapi_prop_tag(PT_BINARY,      0x3410));
-define('PR_IPM_OUTBOX_SEARCH_KEY'                     ,mapi_prop_tag(PT_BINARY,      0x3411));
-define('PR_IPM_WASTEBASKET_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x3412));
-define('PR_IPM_SENTMAIL_SEARCH_KEY'                   ,mapi_prop_tag(PT_BINARY,      0x3413));
-define('PR_MDB_PROVIDER'                              ,mapi_prop_tag(PT_BINARY,      0x3414));
-define('PR_RECEIVE_FOLDER_SETTINGS'                   ,mapi_prop_tag(PT_OBJECT,      0x3415));
+define('PR_IPM_SUBTREE_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3410));
+define('PR_IPM_OUTBOX_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3411));
+define('PR_IPM_WASTEBASKET_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3412));
+define('PR_IPM_SENTMAIL_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3413));
+define('PR_MDB_PROVIDER', mapi_prop_tag(PT_BINARY, 0x3414));
+define('PR_RECEIVE_FOLDER_SETTINGS', mapi_prop_tag(PT_OBJECT, 0x3415));
 
-define('PR_VALID_FOLDER_MASK'                         ,mapi_prop_tag(PT_LONG,        0x35DF));
-define('PR_IPM_SUBTREE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x35E0));
+define('PR_VALID_FOLDER_MASK', mapi_prop_tag(PT_LONG, 0x35DF));
+define('PR_IPM_SUBTREE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E0));
 
-define('PR_IPM_OUTBOX_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x35E2));
-define('PR_IPM_WASTEBASKET_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x35E3));
-define('PR_IPM_SENTMAIL_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x35E4));
-define('PR_VIEWS_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x35E5));
-define('PR_COMMON_VIEWS_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x35E6));
-define('PR_FINDER_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x35E7));
-define('PR_IPM_FAVORITES_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x6630));
-define('PR_IPM_PUBLIC_FOLDERS_ENTRYID'                ,mapi_prop_tag(PT_BINARY,      0x6631));
+define('PR_IPM_OUTBOX_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E2));
+define('PR_IPM_WASTEBASKET_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E3));
+define('PR_IPM_SENTMAIL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E4));
+define('PR_VIEWS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E5));
+define('PR_COMMON_VIEWS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E6));
+define('PR_FINDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E7));
+define('PR_IPM_FAVORITES_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6630));
+define('PR_IPM_PUBLIC_FOLDERS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6631));
 
 
 /* Proptags 0x35E8-0x35FF reserved for folders "guaranteed" by 'PR_VALID_FOLDER_MASK */
@@ -409,31 +409,31 @@ 
  *  Folder and AB Container properties
  */
 
-define('PR_CONTAINER_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x3600));
-define('PR_FOLDER_TYPE'                               ,mapi_prop_tag(PT_LONG,        0x3601));
-define('PR_CONTENT_COUNT'                             ,mapi_prop_tag(PT_LONG,        0x3602));
-define('PR_CONTENT_UNREAD'                            ,mapi_prop_tag(PT_LONG,        0x3603));
-define('PR_CREATE_TEMPLATES'                          ,mapi_prop_tag(PT_OBJECT,      0x3604));
-define('PR_DETAILS_TABLE'                             ,mapi_prop_tag(PT_OBJECT,      0x3605));
-define('PR_SEARCH'                                    ,mapi_prop_tag(PT_OBJECT,      0x3607));
-define('PR_SELECTABLE'                                ,mapi_prop_tag(PT_BOOLEAN,     0x3609));
-define('PR_SUBFOLDERS'                                ,mapi_prop_tag(PT_BOOLEAN,     0x360A));
-define('PR_STATUS'                                    ,mapi_prop_tag(PT_LONG,        0x360B));
-define('PR_ANR'                                       ,mapi_prop_tag(PT_TSTRING,     0x360C));
-define('PR_CONTENTS_SORT_ORDER'                       ,mapi_prop_tag(PT_MV_LONG,     0x360D));
-define('PR_CONTAINER_HIERARCHY'                       ,mapi_prop_tag(PT_OBJECT,      0x360E));
-define('PR_CONTAINER_CONTENTS'                        ,mapi_prop_tag(PT_OBJECT,      0x360F));
-define('PR_FOLDER_ASSOCIATED_CONTENTS'                ,mapi_prop_tag(PT_OBJECT,      0x3610));
-define('PR_DEF_CREATE_DL'                             ,mapi_prop_tag(PT_BINARY,      0x3611));
-define('PR_DEF_CREATE_MAILUSER'                       ,mapi_prop_tag(PT_BINARY,      0x3612));
-define('PR_CONTAINER_CLASS'                           ,mapi_prop_tag(PT_TSTRING,     0x3613));
-define('PR_CONTAINER_MODIFY_VERSION'                  ,mapi_prop_tag(PT_I8,          0x3614));
-define('PR_AB_PROVIDER_ID'                            ,mapi_prop_tag(PT_BINARY,      0x3615));
-define('PR_DEFAULT_VIEW_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x3616));
-define('PR_ASSOC_CONTENT_COUNT'                       ,mapi_prop_tag(PT_LONG,        0x3617));
-define('PR_EXTENDED_FOLDER_FLAGS'                     ,mapi_prop_tag(PT_BINARY,      0x36DA));
-
-define('PR_RIGHTS'                                    ,mapi_prop_tag(PT_LONG,        0x6639));
+define('PR_CONTAINER_FLAGS', mapi_prop_tag(PT_LONG, 0x3600));
+define('PR_FOLDER_TYPE', mapi_prop_tag(PT_LONG, 0x3601));
+define('PR_CONTENT_COUNT', mapi_prop_tag(PT_LONG, 0x3602));
+define('PR_CONTENT_UNREAD', mapi_prop_tag(PT_LONG, 0x3603));
+define('PR_CREATE_TEMPLATES', mapi_prop_tag(PT_OBJECT, 0x3604));
+define('PR_DETAILS_TABLE', mapi_prop_tag(PT_OBJECT, 0x3605));
+define('PR_SEARCH', mapi_prop_tag(PT_OBJECT, 0x3607));
+define('PR_SELECTABLE', mapi_prop_tag(PT_BOOLEAN, 0x3609));
+define('PR_SUBFOLDERS', mapi_prop_tag(PT_BOOLEAN, 0x360A));
+define('PR_STATUS', mapi_prop_tag(PT_LONG, 0x360B));
+define('PR_ANR', mapi_prop_tag(PT_TSTRING, 0x360C));
+define('PR_CONTENTS_SORT_ORDER', mapi_prop_tag(PT_MV_LONG, 0x360D));
+define('PR_CONTAINER_HIERARCHY', mapi_prop_tag(PT_OBJECT, 0x360E));
+define('PR_CONTAINER_CONTENTS', mapi_prop_tag(PT_OBJECT, 0x360F));
+define('PR_FOLDER_ASSOCIATED_CONTENTS', mapi_prop_tag(PT_OBJECT, 0x3610));
+define('PR_DEF_CREATE_DL', mapi_prop_tag(PT_BINARY, 0x3611));
+define('PR_DEF_CREATE_MAILUSER', mapi_prop_tag(PT_BINARY, 0x3612));
+define('PR_CONTAINER_CLASS', mapi_prop_tag(PT_TSTRING, 0x3613));
+define('PR_CONTAINER_MODIFY_VERSION', mapi_prop_tag(PT_I8, 0x3614));
+define('PR_AB_PROVIDER_ID', mapi_prop_tag(PT_BINARY, 0x3615));
+define('PR_DEFAULT_VIEW_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3616));
+define('PR_ASSOC_CONTENT_COUNT', mapi_prop_tag(PT_LONG, 0x3617));
+define('PR_EXTENDED_FOLDER_FLAGS', mapi_prop_tag(PT_BINARY, 0x36DA));
+
+define('PR_RIGHTS', mapi_prop_tag(PT_LONG, 0x6639));
 
 /* Reserved 0x36C0-0x36FF */
 
@@ -441,273 +441,273 @@ 
  *  Attachment properties
  */
 
-define('PR_ATTACHMENT_X400_PARAMETERS'                ,mapi_prop_tag(PT_BINARY,      0x3700));
-define('PR_ATTACH_DATA_OBJ'                           ,mapi_prop_tag(PT_OBJECT,      0x3701));
-define('PR_ATTACH_DATA_BIN'                           ,mapi_prop_tag(PT_BINARY,      0x3701));
-define('PR_ATTACH_CONTENT_ID'                         ,mapi_prop_tag(PT_STRING8,     0x3712));
-define('PR_ATTACH_CONTENT_ID_W'                       ,mapi_prop_tag(PT_UNICODE,     0x3712));
-define('PR_ATTACH_CONTENT_LOCATION'                   ,mapi_prop_tag(PT_STRING8,     0x3713));
-define('PR_ATTACH_ENCODING'                           ,mapi_prop_tag(PT_BINARY,      0x3702));
-define('PR_ATTACH_EXTENSION'                          ,mapi_prop_tag(PT_TSTRING,     0x3703));
-define('PR_ATTACH_FILENAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3704));
-define('PR_ATTACH_METHOD'                             ,mapi_prop_tag(PT_LONG,        0x3705));
-define('PR_ATTACH_LONG_FILENAME'                      ,mapi_prop_tag(PT_TSTRING,     0x3707));
-define('PR_ATTACH_PATHNAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3708));
-define('PR_ATTACH_RENDERING'                          ,mapi_prop_tag(PT_BINARY,      0x3709));
-define('PR_ATTACH_TAG'                                ,mapi_prop_tag(PT_BINARY,      0x370A));
-define('PR_RENDERING_POSITION'                        ,mapi_prop_tag(PT_LONG,        0x370B));
-define('PR_ATTACH_TRANSPORT_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x370C));
-define('PR_ATTACH_LONG_PATHNAME'                      ,mapi_prop_tag(PT_TSTRING,     0x370D));
-define('PR_ATTACH_MIME_TAG'                           ,mapi_prop_tag(PT_TSTRING,     0x370E));
-define('PR_ATTACH_MIME_TAG_W'                         ,mapi_prop_tag(PT_UNICODE,     0x370E));
-define('PR_ATTACH_ADDITIONAL_INFO'                    ,mapi_prop_tag(PT_BINARY,      0x370F));
-define('PR_ATTACHMENT_FLAGS'                          ,mapi_prop_tag(PT_LONG,        0x7FFD));
-define('PR_ATTACHMENT_HIDDEN'                         ,mapi_prop_tag(PT_BOOLEAN,     0x7FFE));
-define('PR_ATTACHMENT_LINKID'                         ,mapi_prop_tag(PT_LONG,        0x7FFA));
-define('PR_ATTACH_FLAGS'                              ,mapi_prop_tag(PT_LONG,        0x3714));
-define('PR_EXCEPTION_STARTTIME'                       ,mapi_prop_tag(PT_SYSTIME,     0x7FFB));
-define('PR_EXCEPTION_ENDTIME'                         ,mapi_prop_tag(PT_SYSTIME,     0x7FFC));
+define('PR_ATTACHMENT_X400_PARAMETERS', mapi_prop_tag(PT_BINARY, 0x3700));
+define('PR_ATTACH_DATA_OBJ', mapi_prop_tag(PT_OBJECT, 0x3701));
+define('PR_ATTACH_DATA_BIN', mapi_prop_tag(PT_BINARY, 0x3701));
+define('PR_ATTACH_CONTENT_ID', mapi_prop_tag(PT_STRING8, 0x3712));
+define('PR_ATTACH_CONTENT_ID_W', mapi_prop_tag(PT_UNICODE, 0x3712));
+define('PR_ATTACH_CONTENT_LOCATION', mapi_prop_tag(PT_STRING8, 0x3713));
+define('PR_ATTACH_ENCODING', mapi_prop_tag(PT_BINARY, 0x3702));
+define('PR_ATTACH_EXTENSION', mapi_prop_tag(PT_TSTRING, 0x3703));
+define('PR_ATTACH_FILENAME', mapi_prop_tag(PT_TSTRING, 0x3704));
+define('PR_ATTACH_METHOD', mapi_prop_tag(PT_LONG, 0x3705));
+define('PR_ATTACH_LONG_FILENAME', mapi_prop_tag(PT_TSTRING, 0x3707));
+define('PR_ATTACH_PATHNAME', mapi_prop_tag(PT_TSTRING, 0x3708));
+define('PR_ATTACH_RENDERING', mapi_prop_tag(PT_BINARY, 0x3709));
+define('PR_ATTACH_TAG', mapi_prop_tag(PT_BINARY, 0x370A));
+define('PR_RENDERING_POSITION', mapi_prop_tag(PT_LONG, 0x370B));
+define('PR_ATTACH_TRANSPORT_NAME', mapi_prop_tag(PT_TSTRING, 0x370C));
+define('PR_ATTACH_LONG_PATHNAME', mapi_prop_tag(PT_TSTRING, 0x370D));
+define('PR_ATTACH_MIME_TAG', mapi_prop_tag(PT_TSTRING, 0x370E));
+define('PR_ATTACH_MIME_TAG_W', mapi_prop_tag(PT_UNICODE, 0x370E));
+define('PR_ATTACH_ADDITIONAL_INFO', mapi_prop_tag(PT_BINARY, 0x370F));
+define('PR_ATTACHMENT_FLAGS', mapi_prop_tag(PT_LONG, 0x7FFD));
+define('PR_ATTACHMENT_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x7FFE));
+define('PR_ATTACHMENT_LINKID', mapi_prop_tag(PT_LONG, 0x7FFA));
+define('PR_ATTACH_FLAGS', mapi_prop_tag(PT_LONG, 0x3714));
+define('PR_EXCEPTION_STARTTIME', mapi_prop_tag(PT_SYSTIME, 0x7FFB));
+define('PR_EXCEPTION_ENDTIME', mapi_prop_tag(PT_SYSTIME, 0x7FFC));
 
 /*
  *  AB Object properties
  */
 
-define('PR_DISPLAY_TYPE'                              ,mapi_prop_tag(PT_LONG,        0x3900));
-define('PR_DISPLAY_TYPE_EX'                           ,mapi_prop_tag(PT_LONG,        0x3905));
-define('PR_TEMPLATEID'                                ,mapi_prop_tag(PT_BINARY,      0x3902));
-define('PR_PRIMARY_CAPABILITY'                        ,mapi_prop_tag(PT_BINARY,      0x3904));
+define('PR_DISPLAY_TYPE', mapi_prop_tag(PT_LONG, 0x3900));
+define('PR_DISPLAY_TYPE_EX', mapi_prop_tag(PT_LONG, 0x3905));
+define('PR_TEMPLATEID', mapi_prop_tag(PT_BINARY, 0x3902));
+define('PR_PRIMARY_CAPABILITY', mapi_prop_tag(PT_BINARY, 0x3904));
 
 
 /*
  *  Mail user properties
  */
-define('PR_7BIT_DISPLAY_NAME'                         ,mapi_prop_tag(PT_STRING8,     0x39FF));
-define('PR_ACCOUNT'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A00));
-define('PR_ALTERNATE_RECIPIENT'                       ,mapi_prop_tag(PT_BINARY,      0x3A01));
-define('PR_CALLBACK_TELEPHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A02));
-define('PR_CONVERSION_PROHIBITED'                     ,mapi_prop_tag(PT_BOOLEAN,     0x3A03));
-define('PR_DISCLOSE_RECIPIENTS'                       ,mapi_prop_tag(PT_BOOLEAN,     0x3A04));
-define('PR_GENERATION'                                ,mapi_prop_tag(PT_TSTRING,     0x3A05));
-define('PR_GIVEN_NAME'                                ,mapi_prop_tag(PT_TSTRING,     0x3A06));
-define('PR_GOVERNMENT_ID_NUMBER'                      ,mapi_prop_tag(PT_TSTRING,     0x3A07));
-define('PR_BUSINESS_TELEPHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A08));
-define('PR_OFFICE_TELEPHONE_NUMBER'                   ,PR_BUSINESS_TELEPHONE_NUMBER);
-define('PR_HOME_TELEPHONE_NUMBER'                     ,mapi_prop_tag(PT_TSTRING,     0x3A09));
-define('PR_INITIALS'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0A));
-define('PR_KEYWORD'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A0B));
-define('PR_LANGUAGE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0C));
-define('PR_LOCATION'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0D));
-define('PR_MAIL_PERMISSION'                           ,mapi_prop_tag(PT_BOOLEAN,     0x3A0E));
-define('PR_MHS_COMMON_NAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3A0F));
-define('PR_ORGANIZATIONAL_ID_NUMBER'                  ,mapi_prop_tag(PT_TSTRING,     0x3A10));
-define('PR_SURNAME'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A11));
-define('PR_ORIGINAL_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x3A12));
-define('PR_ORIGINAL_DISPLAY_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x3A13));
-define('PR_ORIGINAL_SEARCH_KEY'                       ,mapi_prop_tag(PT_BINARY,      0x3A14));
-define('PR_POSTAL_ADDRESS'                            ,mapi_prop_tag(PT_TSTRING,     0x3A15));
-define('PR_COMPANY_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3A16));
-define('PR_TITLE'                                     ,mapi_prop_tag(PT_TSTRING,     0x3A17));
-define('PR_DEPARTMENT_NAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3A18));
-define('PR_OFFICE_LOCATION'                           ,mapi_prop_tag(PT_TSTRING,     0x3A19));
-define('PR_PRIMARY_TELEPHONE_NUMBER'                  ,mapi_prop_tag(PT_TSTRING,     0x3A1A));
-define('PR_BUSINESS2_TELEPHONE_NUMBER'                ,mapi_prop_tag(PT_TSTRING,     0x3A1B));
-define('PR_OFFICE2_TELEPHONE_NUMBER'                  ,PR_BUSINESS2_TELEPHONE_NUMBER);
-define('PR_MOBILE_TELEPHONE_NUMBER'                   ,mapi_prop_tag(PT_TSTRING,     0x3A1C));
-define('PR_CELLULAR_TELEPHONE_NUMBER'                 ,PR_MOBILE_TELEPHONE_NUMBER);
-define('PR_RADIO_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A1D));
-define('PR_CAR_TELEPHONE_NUMBER'                      ,mapi_prop_tag(PT_TSTRING,     0x3A1E));
-define('PR_OTHER_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A1F));
-define('PR_TRANSMITABLE_DISPLAY_NAME'                 ,mapi_prop_tag(PT_TSTRING,     0x3A20));
-define('PR_PAGER_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A21));
-define('PR_BEEPER_TELEPHONE_NUMBER'                   ,PR_PAGER_TELEPHONE_NUMBER);
-define('PR_USER_CERTIFICATE'                          ,mapi_prop_tag(PT_BINARY,      0x3A22));
-define('PR_PRIMARY_FAX_NUMBER'                        ,mapi_prop_tag(PT_TSTRING,     0x3A23));
-define('PR_BUSINESS_FAX_NUMBER'                       ,mapi_prop_tag(PT_TSTRING,     0x3A24));
-define('PR_HOME_FAX_NUMBER'                           ,mapi_prop_tag(PT_TSTRING,     0x3A25));
-define('PR_COUNTRY'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A26));
-define('PR_BUSINESS_ADDRESS_COUNTRY'                  ,PR_COUNTRY);
+define('PR_7BIT_DISPLAY_NAME', mapi_prop_tag(PT_STRING8, 0x39FF));
+define('PR_ACCOUNT', mapi_prop_tag(PT_TSTRING, 0x3A00));
+define('PR_ALTERNATE_RECIPIENT', mapi_prop_tag(PT_BINARY, 0x3A01));
+define('PR_CALLBACK_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A02));
+define('PR_CONVERSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x3A03));
+define('PR_DISCLOSE_RECIPIENTS', mapi_prop_tag(PT_BOOLEAN, 0x3A04));
+define('PR_GENERATION', mapi_prop_tag(PT_TSTRING, 0x3A05));
+define('PR_GIVEN_NAME', mapi_prop_tag(PT_TSTRING, 0x3A06));
+define('PR_GOVERNMENT_ID_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A07));
+define('PR_BUSINESS_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A08));
+define('PR_OFFICE_TELEPHONE_NUMBER', PR_BUSINESS_TELEPHONE_NUMBER);
+define('PR_HOME_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A09));
+define('PR_INITIALS', mapi_prop_tag(PT_TSTRING, 0x3A0A));
+define('PR_KEYWORD', mapi_prop_tag(PT_TSTRING, 0x3A0B));
+define('PR_LANGUAGE', mapi_prop_tag(PT_TSTRING, 0x3A0C));
+define('PR_LOCATION', mapi_prop_tag(PT_TSTRING, 0x3A0D));
+define('PR_MAIL_PERMISSION', mapi_prop_tag(PT_BOOLEAN, 0x3A0E));
+define('PR_MHS_COMMON_NAME', mapi_prop_tag(PT_TSTRING, 0x3A0F));
+define('PR_ORGANIZATIONAL_ID_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A10));
+define('PR_SURNAME', mapi_prop_tag(PT_TSTRING, 0x3A11));
+define('PR_ORIGINAL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3A12));
+define('PR_ORIGINAL_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A13));
+define('PR_ORIGINAL_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3A14));
+define('PR_POSTAL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3A15));
+define('PR_COMPANY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A16));
+define('PR_TITLE', mapi_prop_tag(PT_TSTRING, 0x3A17));
+define('PR_DEPARTMENT_NAME', mapi_prop_tag(PT_TSTRING, 0x3A18));
+define('PR_OFFICE_LOCATION', mapi_prop_tag(PT_TSTRING, 0x3A19));
+define('PR_PRIMARY_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1A));
+define('PR_BUSINESS2_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1B));
+define('PR_OFFICE2_TELEPHONE_NUMBER', PR_BUSINESS2_TELEPHONE_NUMBER);
+define('PR_MOBILE_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1C));
+define('PR_CELLULAR_TELEPHONE_NUMBER', PR_MOBILE_TELEPHONE_NUMBER);
+define('PR_RADIO_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1D));
+define('PR_CAR_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1E));
+define('PR_OTHER_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1F));
+define('PR_TRANSMITABLE_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A20));
+define('PR_PAGER_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A21));
+define('PR_BEEPER_TELEPHONE_NUMBER', PR_PAGER_TELEPHONE_NUMBER);
+define('PR_USER_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x3A22));
+define('PR_PRIMARY_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A23));
+define('PR_BUSINESS_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A24));
+define('PR_HOME_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A25));
+define('PR_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A26));
+define('PR_BUSINESS_ADDRESS_COUNTRY', PR_COUNTRY);
 
-define('PR_FLAG_STATUS'                               ,mapi_prop_tag(PT_LONG,        0x1090));
-define('PR_FLAG_COMPLETE_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x1091));
-define('PR_FLAG_ICON'                                 ,mapi_prop_tag(PT_LONG,        0x1095));
-define('PR_BLOCK_STATUS'                              ,mapi_prop_tag(PT_LONG,        0x1096));
+define('PR_FLAG_STATUS', mapi_prop_tag(PT_LONG, 0x1090));
+define('PR_FLAG_COMPLETE_TIME', mapi_prop_tag(PT_SYSTIME, 0x1091));
+define('PR_FLAG_ICON', mapi_prop_tag(PT_LONG, 0x1095));
+define('PR_BLOCK_STATUS', mapi_prop_tag(PT_LONG, 0x1096));
 
-define('PR_LOCALITY'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A27));
-define('PR_BUSINESS_ADDRESS_CITY'                     ,PR_LOCALITY);
+define('PR_LOCALITY', mapi_prop_tag(PT_TSTRING, 0x3A27));
+define('PR_BUSINESS_ADDRESS_CITY', PR_LOCALITY);
 
-define('PR_STATE_OR_PROVINCE'                         ,mapi_prop_tag(PT_TSTRING,     0x3A28));
-define('PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE'        ,PR_STATE_OR_PROVINCE);
+define('PR_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A28));
+define('PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE', PR_STATE_OR_PROVINCE);
 
-define('PR_STREET_ADDRESS'                            ,mapi_prop_tag(PT_TSTRING,     0x3A29));
-define('PR_BUSINESS_ADDRESS_STREET'                   ,PR_STREET_ADDRESS);
+define('PR_STREET_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3A29));
+define('PR_BUSINESS_ADDRESS_STREET', PR_STREET_ADDRESS);
 
-define('PR_POSTAL_CODE'                               ,mapi_prop_tag(PT_TSTRING,     0x3A2A));
-define('PR_BUSINESS_ADDRESS_POSTAL_CODE'              ,PR_POSTAL_CODE);
+define('PR_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A2A));
+define('PR_BUSINESS_ADDRESS_POSTAL_CODE', PR_POSTAL_CODE);
 
 
-define('PR_POST_OFFICE_BOX'                           ,mapi_prop_tag(PT_TSTRING,     0x3A2B));
-define('PR_BUSINESS_ADDRESS_POST_OFFICE_BOX'          ,PR_POST_OFFICE_BOX);
+define('PR_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A2B));
+define('PR_BUSINESS_ADDRESS_POST_OFFICE_BOX', PR_POST_OFFICE_BOX);
 
 
-define('PR_TELEX_NUMBER'                              ,mapi_prop_tag(PT_TSTRING,     0x3A2C));
-define('PR_ISDN_NUMBER'                               ,mapi_prop_tag(PT_TSTRING,     0x3A2D));
-define('PR_ASSISTANT_TELEPHONE_NUMBER'                ,mapi_prop_tag(PT_TSTRING,     0x3A2E));
-define('PR_HOME2_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A2F));
-define('PR_ASSISTANT'                                 ,mapi_prop_tag(PT_TSTRING,     0x3A30));
-define('PR_SEND_RICH_INFO'                            ,mapi_prop_tag(PT_BOOLEAN,     0x3A40));
-define('PR_WEDDING_ANNIVERSARY'                       ,mapi_prop_tag(PT_SYSTIME,     0x3A41));
-define('PR_BIRTHDAY'                                  ,mapi_prop_tag(PT_SYSTIME,     0x3A42));
+define('PR_TELEX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2C));
+define('PR_ISDN_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2D));
+define('PR_ASSISTANT_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2E));
+define('PR_HOME2_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2F));
+define('PR_ASSISTANT', mapi_prop_tag(PT_TSTRING, 0x3A30));
+define('PR_SEND_RICH_INFO', mapi_prop_tag(PT_BOOLEAN, 0x3A40));
+define('PR_WEDDING_ANNIVERSARY', mapi_prop_tag(PT_SYSTIME, 0x3A41));
+define('PR_BIRTHDAY', mapi_prop_tag(PT_SYSTIME, 0x3A42));
 
 
-define('PR_HOBBIES'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A43));
+define('PR_HOBBIES', mapi_prop_tag(PT_TSTRING, 0x3A43));
 
-define('PR_MIDDLE_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x3A44));
+define('PR_MIDDLE_NAME', mapi_prop_tag(PT_TSTRING, 0x3A44));
 
-define('PR_DISPLAY_NAME_PREFIX'                       ,mapi_prop_tag(PT_TSTRING,     0x3A45));
+define('PR_DISPLAY_NAME_PREFIX', mapi_prop_tag(PT_TSTRING, 0x3A45));
 
-define('PR_PROFESSION'                                ,mapi_prop_tag(PT_TSTRING,     0x3A46));
+define('PR_PROFESSION', mapi_prop_tag(PT_TSTRING, 0x3A46));
 
-define('PR_PREFERRED_BY_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x3A47));
+define('PR_PREFERRED_BY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A47));
 
-define('PR_SPOUSE_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x3A48));
+define('PR_SPOUSE_NAME', mapi_prop_tag(PT_TSTRING, 0x3A48));
 
-define('PR_COMPUTER_NETWORK_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x3A49));
+define('PR_COMPUTER_NETWORK_NAME', mapi_prop_tag(PT_TSTRING, 0x3A49));
 
-define('PR_CUSTOMER_ID'                               ,mapi_prop_tag(PT_TSTRING,     0x3A4A));
+define('PR_CUSTOMER_ID', mapi_prop_tag(PT_TSTRING, 0x3A4A));
 
-define('PR_TTYTDD_PHONE_NUMBER'                       ,mapi_prop_tag(PT_TSTRING,     0x3A4B));
+define('PR_TTYTDD_PHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A4B));
 
-define('PR_FTP_SITE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A4C));
+define('PR_FTP_SITE', mapi_prop_tag(PT_TSTRING, 0x3A4C));
 
-define('PR_GENDER'                                    ,mapi_prop_tag(PT_SHORT,       0x3A4D));
+define('PR_GENDER', mapi_prop_tag(PT_SHORT, 0x3A4D));
 
-define('PR_MANAGER_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3A4E));
+define('PR_MANAGER_NAME', mapi_prop_tag(PT_TSTRING, 0x3A4E));
 
-define('PR_NICKNAME'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A4F));
+define('PR_NICKNAME', mapi_prop_tag(PT_TSTRING, 0x3A4F));
 
-define('PR_PERSONAL_HOME_PAGE'                        ,mapi_prop_tag(PT_TSTRING,     0x3A50));
+define('PR_PERSONAL_HOME_PAGE', mapi_prop_tag(PT_TSTRING, 0x3A50));
 
 
-define('PR_BUSINESS_HOME_PAGE'                        ,mapi_prop_tag(PT_TSTRING,     0x3A51));
+define('PR_BUSINESS_HOME_PAGE', mapi_prop_tag(PT_TSTRING, 0x3A51));
 
-define('PR_CONTACT_VERSION'                           ,mapi_prop_tag(PT_CLSID,       0x3A52));
-define('PR_CONTACT_ENTRYIDS'                          ,mapi_prop_tag(PT_MV_BINARY,   0x3A53));
+define('PR_CONTACT_VERSION', mapi_prop_tag(PT_CLSID, 0x3A52));
+define('PR_CONTACT_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x3A53));
 
-define('PR_CONTACT_ADDRTYPES'                         ,mapi_prop_tag(PT_MV_TSTRING,  0x3A54));
+define('PR_CONTACT_ADDRTYPES', mapi_prop_tag(PT_MV_TSTRING, 0x3A54));
 
-define('PR_CONTACT_DEFAULT_ADDRESS_INDEX'             ,mapi_prop_tag(PT_LONG,        0x3A55));
+define('PR_CONTACT_DEFAULT_ADDRESS_INDEX', mapi_prop_tag(PT_LONG, 0x3A55));
 
-define('PR_CONTACT_EMAIL_ADDRESSES'                   ,mapi_prop_tag(PT_MV_TSTRING,  0x3A56));
-define('PR_ATTACHMENT_CONTACTPHOTO'                   ,mapi_prop_tag(PT_BOOLEAN,     0x7FFF));
+define('PR_CONTACT_EMAIL_ADDRESSES', mapi_prop_tag(PT_MV_TSTRING, 0x3A56));
+define('PR_ATTACHMENT_CONTACTPHOTO', mapi_prop_tag(PT_BOOLEAN, 0x7FFF));
 
 
-define('PR_COMPANY_MAIN_PHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A57));
+define('PR_COMPANY_MAIN_PHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A57));
 
-define('PR_CHILDRENS_NAMES'                           ,mapi_prop_tag(PT_MV_TSTRING,  0x3A58));
+define('PR_CHILDRENS_NAMES', mapi_prop_tag(PT_MV_TSTRING, 0x3A58));
 
 
 
-define('PR_HOME_ADDRESS_CITY'                         ,mapi_prop_tag(PT_TSTRING,     0x3A59));
+define('PR_HOME_ADDRESS_CITY', mapi_prop_tag(PT_TSTRING, 0x3A59));
 
-define('PR_HOME_ADDRESS_COUNTRY'                      ,mapi_prop_tag(PT_TSTRING,     0x3A5A));
+define('PR_HOME_ADDRESS_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A5A));
 
-define('PR_HOME_ADDRESS_POSTAL_CODE'                  ,mapi_prop_tag(PT_TSTRING,     0x3A5B));
+define('PR_HOME_ADDRESS_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A5B));
 
-define('PR_HOME_ADDRESS_STATE_OR_PROVINCE'            ,mapi_prop_tag(PT_TSTRING,     0x3A5C));
+define('PR_HOME_ADDRESS_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A5C));
 
-define('PR_HOME_ADDRESS_STREET'                       ,mapi_prop_tag(PT_TSTRING,     0x3A5D));
+define('PR_HOME_ADDRESS_STREET', mapi_prop_tag(PT_TSTRING, 0x3A5D));
 
-define('PR_HOME_ADDRESS_POST_OFFICE_BOX'              ,mapi_prop_tag(PT_TSTRING,     0x3A5E));
+define('PR_HOME_ADDRESS_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A5E));
 
-define('PR_OTHER_ADDRESS_CITY'                        ,mapi_prop_tag(PT_TSTRING,     0x3A5F));
+define('PR_OTHER_ADDRESS_CITY', mapi_prop_tag(PT_TSTRING, 0x3A5F));
 
-define('PR_OTHER_ADDRESS_COUNTRY'                     ,mapi_prop_tag(PT_TSTRING,     0x3A60));
+define('PR_OTHER_ADDRESS_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A60));
 
-define('PR_OTHER_ADDRESS_POSTAL_CODE'                 ,mapi_prop_tag(PT_TSTRING,     0x3A61));
+define('PR_OTHER_ADDRESS_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A61));
 
-define('PR_OTHER_ADDRESS_STATE_OR_PROVINCE'           ,mapi_prop_tag(PT_TSTRING,     0x3A62));
+define('PR_OTHER_ADDRESS_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A62));
 
-define('PR_OTHER_ADDRESS_STREET'                      ,mapi_prop_tag(PT_TSTRING,     0x3A63));
+define('PR_OTHER_ADDRESS_STREET', mapi_prop_tag(PT_TSTRING, 0x3A63));
 
-define('PR_OTHER_ADDRESS_POST_OFFICE_BOX'             ,mapi_prop_tag(PT_TSTRING,     0x3A64));
+define('PR_OTHER_ADDRESS_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A64));
 
-define('PR_USER_X509_CERTIFICATE'                     ,mapi_prop_tag(PT_MV_BINARY,   0x3A70));
+define('PR_USER_X509_CERTIFICATE', mapi_prop_tag(PT_MV_BINARY, 0x3A70));
 
 /*
  *  Profile section properties
  */
 
-define('PR_STORE_PROVIDERS'                           ,mapi_prop_tag(PT_BINARY,      0x3D00));
-define('PR_AB_PROVIDERS'                              ,mapi_prop_tag(PT_BINARY,      0x3D01));
-define('PR_TRANSPORT_PROVIDERS'                       ,mapi_prop_tag(PT_BINARY,      0x3D02));
-
-define('PR_DEFAULT_PROFILE'                           ,mapi_prop_tag(PT_BOOLEAN,     0x3D04));
-define('PR_AB_SEARCH_PATH'                            ,mapi_prop_tag(PT_MV_BINARY,   0x3D05));
-define('PR_AB_DEFAULT_DIR'                            ,mapi_prop_tag(PT_BINARY,      0x3D06));
-define('PR_AB_DEFAULT_PAB'                            ,mapi_prop_tag(PT_BINARY,      0x3D07));
-
-define('PR_FILTERING_HOOKS'                           ,mapi_prop_tag(PT_BINARY,      0x3D08));
-define('PR_SERVICE_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3D09));
-define('PR_SERVICE_DLL_NAME'                          ,mapi_prop_tag(PT_TSTRING,     0x3D0A));
-define('PR_SERVICE_ENTRY_NAME'                        ,mapi_prop_tag(PT_STRING8,     0x3D0B));
-define('PR_SERVICE_UID'                               ,mapi_prop_tag(PT_BINARY,      0x3D0C));
-define('PR_SERVICE_EXTRA_UIDS'                        ,mapi_prop_tag(PT_BINARY,      0x3D0D));
-define('PR_SERVICES'                                  ,mapi_prop_tag(PT_BINARY,      0x3D0E));
-define('PR_SERVICE_SUPPORT_FILES'                     ,mapi_prop_tag(PT_MV_TSTRING,  0x3D0F));
-define('PR_SERVICE_DELETE_FILES'                      ,mapi_prop_tag(PT_MV_TSTRING,  0x3D10));
-define('PR_AB_SEARCH_PATH_UPDATE'                     ,mapi_prop_tag(PT_BINARY,      0x3D11));
-define('PR_PROFILE_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3D12));
+define('PR_STORE_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D00));
+define('PR_AB_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D01));
+define('PR_TRANSPORT_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D02));
+
+define('PR_DEFAULT_PROFILE', mapi_prop_tag(PT_BOOLEAN, 0x3D04));
+define('PR_AB_SEARCH_PATH', mapi_prop_tag(PT_MV_BINARY, 0x3D05));
+define('PR_AB_DEFAULT_DIR', mapi_prop_tag(PT_BINARY, 0x3D06));
+define('PR_AB_DEFAULT_PAB', mapi_prop_tag(PT_BINARY, 0x3D07));
+
+define('PR_FILTERING_HOOKS', mapi_prop_tag(PT_BINARY, 0x3D08));
+define('PR_SERVICE_NAME', mapi_prop_tag(PT_TSTRING, 0x3D09));
+define('PR_SERVICE_DLL_NAME', mapi_prop_tag(PT_TSTRING, 0x3D0A));
+define('PR_SERVICE_ENTRY_NAME', mapi_prop_tag(PT_STRING8, 0x3D0B));
+define('PR_SERVICE_UID', mapi_prop_tag(PT_BINARY, 0x3D0C));
+define('PR_SERVICE_EXTRA_UIDS', mapi_prop_tag(PT_BINARY, 0x3D0D));
+define('PR_SERVICES', mapi_prop_tag(PT_BINARY, 0x3D0E));
+define('PR_SERVICE_SUPPORT_FILES', mapi_prop_tag(PT_MV_TSTRING, 0x3D0F));
+define('PR_SERVICE_DELETE_FILES', mapi_prop_tag(PT_MV_TSTRING, 0x3D10));
+define('PR_AB_SEARCH_PATH_UPDATE', mapi_prop_tag(PT_BINARY, 0x3D11));
+define('PR_PROFILE_NAME', mapi_prop_tag(PT_TSTRING, 0x3D12));
 
 /*
  *  Status object properties
  */
 
-define('PR_IDENTITY_DISPLAY'                          ,mapi_prop_tag(PT_TSTRING,     0x3E00));
-define('PR_IDENTITY_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x3E01));
-define('PR_RESOURCE_METHODS'                          ,mapi_prop_tag(PT_LONG,        0x3E02));
-define('PR_RESOURCE_TYPE'                             ,mapi_prop_tag(PT_LONG,        0x3E03));
-define('PR_STATUS_CODE'                               ,mapi_prop_tag(PT_LONG,        0x3E04));
-define('PR_IDENTITY_SEARCH_KEY'                       ,mapi_prop_tag(PT_BINARY,      0x3E05));
-define('PR_OWN_STORE_ENTRYID'                         ,mapi_prop_tag(PT_BINARY,      0x3E06));
-define('PR_RESOURCE_PATH'                             ,mapi_prop_tag(PT_TSTRING,     0x3E07));
-define('PR_STATUS_STRING'                             ,mapi_prop_tag(PT_TSTRING,     0x3E08));
-define('PR_X400_DEFERRED_DELIVERY_CANCEL'             ,mapi_prop_tag(PT_BOOLEAN,     0x3E09));
-define('PR_HEADER_FOLDER_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x3E0A));
-define('PR_REMOTE_PROGRESS'                           ,mapi_prop_tag(PT_LONG,        0x3E0B));
-define('PR_REMOTE_PROGRESS_TEXT'                      ,mapi_prop_tag(PT_TSTRING,     0x3E0C));
-define('PR_REMOTE_VALIDATE_OK'                        ,mapi_prop_tag(PT_BOOLEAN,     0x3E0D));
+define('PR_IDENTITY_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x3E00));
+define('PR_IDENTITY_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E01));
+define('PR_RESOURCE_METHODS', mapi_prop_tag(PT_LONG, 0x3E02));
+define('PR_RESOURCE_TYPE', mapi_prop_tag(PT_LONG, 0x3E03));
+define('PR_STATUS_CODE', mapi_prop_tag(PT_LONG, 0x3E04));
+define('PR_IDENTITY_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3E05));
+define('PR_OWN_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E06));
+define('PR_RESOURCE_PATH', mapi_prop_tag(PT_TSTRING, 0x3E07));
+define('PR_STATUS_STRING', mapi_prop_tag(PT_TSTRING, 0x3E08));
+define('PR_X400_DEFERRED_DELIVERY_CANCEL', mapi_prop_tag(PT_BOOLEAN, 0x3E09));
+define('PR_HEADER_FOLDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E0A));
+define('PR_REMOTE_PROGRESS', mapi_prop_tag(PT_LONG, 0x3E0B));
+define('PR_REMOTE_PROGRESS_TEXT', mapi_prop_tag(PT_TSTRING, 0x3E0C));
+define('PR_REMOTE_VALIDATE_OK', mapi_prop_tag(PT_BOOLEAN, 0x3E0D));
 
 /*
  * Display table properties
  */
 
-define('PR_CONTROL_FLAGS'                             ,mapi_prop_tag(PT_LONG,        0x3F00));
-define('PR_CONTROL_STRUCTURE'                         ,mapi_prop_tag(PT_BINARY,      0x3F01));
-define('PR_CONTROL_TYPE'                              ,mapi_prop_tag(PT_LONG,        0x3F02));
-define('PR_DELTAX'                                    ,mapi_prop_tag(PT_LONG,        0x3F03));
-define('PR_DELTAY'                                    ,mapi_prop_tag(PT_LONG,        0x3F04));
-define('PR_XPOS'                                      ,mapi_prop_tag(PT_LONG,        0x3F05));
-define('PR_YPOS'                                      ,mapi_prop_tag(PT_LONG,        0x3F06));
-define('PR_CONTROL_ID'                                ,mapi_prop_tag(PT_BINARY,      0x3F07));
-define('PR_INITIAL_DETAILS_PANE'                      ,mapi_prop_tag(PT_LONG,        0x3F08));
+define('PR_CONTROL_FLAGS', mapi_prop_tag(PT_LONG, 0x3F00));
+define('PR_CONTROL_STRUCTURE', mapi_prop_tag(PT_BINARY, 0x3F01));
+define('PR_CONTROL_TYPE', mapi_prop_tag(PT_LONG, 0x3F02));
+define('PR_DELTAX', mapi_prop_tag(PT_LONG, 0x3F03));
+define('PR_DELTAY', mapi_prop_tag(PT_LONG, 0x3F04));
+define('PR_XPOS', mapi_prop_tag(PT_LONG, 0x3F05));
+define('PR_YPOS', mapi_prop_tag(PT_LONG, 0x3F06));
+define('PR_CONTROL_ID', mapi_prop_tag(PT_BINARY, 0x3F07));
+define('PR_INITIAL_DETAILS_PANE', mapi_prop_tag(PT_LONG, 0x3F08));
 
 /*
  * Secure property id range
  */
 
-define('PROP_ID_SECURE_MIN'                           ,0x67F0);
-define('PROP_ID_SECURE_MAX'                           ,0x67FF);
+define('PROP_ID_SECURE_MIN', 0x67F0);
+define('PROP_ID_SECURE_MAX', 0x67FF);
 
 /*
  * Extra properties
  */
 
-define('PR_IPM_APPOINTMENT_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x36D0));
-define('PR_IPM_CONTACT_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D1));
-define('PR_IPM_JOURNAL_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D2));
-define('PR_IPM_NOTE_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x36D3));
-define('PR_IPM_TASK_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x36D4));
-define('PR_IPM_DRAFTS_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x36D7));
+define('PR_IPM_APPOINTMENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D0));
+define('PR_IPM_CONTACT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D1));
+define('PR_IPM_JOURNAL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D2));
+define('PR_IPM_NOTE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D3));
+define('PR_IPM_TASK_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D4));
+define('PR_IPM_DRAFTS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D7));
 /*
 PR_ADDITIONAL_REN_ENTRYIDS:
     This is a multivalued property which contains entry IDs for certain special folders.
@@ -719,11 +719,11 @@ 
         4 - Junk E-mail Folder
         5 - sfSpamTagDontUse (unknown what this is, disable olk spam stuff?)
 */
-define('PR_ADDITIONAL_REN_ENTRYIDS'                   ,mapi_prop_tag(PT_MV_BINARY,   0x36D8));
-define('PR_FREEBUSY_ENTRYIDS'                         ,mapi_prop_tag(PT_MV_BINARY,   0x36E4));
-define('PR_REM_ONLINE_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x36D5));
-define('PR_REM_OFFLINE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D6));
-define('PR_FREEBUSY_COUNT_MONTHS'                     ,mapi_prop_tag(PT_LONG,        0x6869));
+define('PR_ADDITIONAL_REN_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x36D8));
+define('PR_FREEBUSY_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x36E4));
+define('PR_REM_ONLINE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D5));
+define('PR_REM_OFFLINE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D6));
+define('PR_FREEBUSY_COUNT_MONTHS', mapi_prop_tag(PT_LONG, 0x6869));
 /*
 PR_IPM_OL2007_ENTRYIDS:
     This is a single binary property containing the entryids for:
@@ -755,10 +755,10 @@ 
     00000000B774162F0098C84182DE9E4358E4249D01000B41FF66083D464EA7E34D6026C9B143000000006DDA0000 (entryid)
     00000000 (terminator?)
 */
-define('PR_IPM_OL2007_ENTRYIDS'                       ,mapi_prop_tag(PT_BINARY,      0x36D9));
+define('PR_IPM_OL2007_ENTRYIDS', mapi_prop_tag(PT_BINARY, 0x36D9));
 // Note: PR_IPM_OL2007_ENTRYIDS is the same property as PR_ADDITIONAL_REN_ENTRYIDS_EX, but Microsoft
 // seems to use the latter hence we will also use that to not confuse developers that want to Google it.
-define('PR_ADDITIONAL_REN_ENTRYIDS_EX'                ,mapi_prop_tag(PT_BINARY,      0x36D9));
+define('PR_ADDITIONAL_REN_ENTRYIDS_EX', mapi_prop_tag(PT_BINARY, 0x36D9));
 
 
 
@@ -766,160 +766,160 @@ 
  * Don't know where to put these
  */
 
-define('PR_ICON_INDEX'                                ,mapi_prop_tag(PT_LONG,        0x1080));
-define('PR_LAST_VERB_EXECUTED'                        ,mapi_prop_tag(PT_LONG,        0x1081));
-define('PR_LAST_VERB_EXECUTION_TIME'                  ,mapi_prop_tag(PT_SYSTIME,     0x1082));
-define('PR_INTERNET_CPID'                             ,mapi_prop_tag(PT_LONG,        0x3FDE));
-define('PR_RECIPIENT_ENTRYID'                         ,mapi_prop_tag(PT_BINARY,      0x5FF7));
-define('PR_SEND_INTERNET_ENCODING'                    ,mapi_prop_tag(PT_LONG,        0x3FDE));
-define('PR_RECIPIENT_DISPLAY_NAME'                    ,mapi_prop_tag(PT_STRING8,     0x5FF6));
-define('PR_RECIPIENT_TRACKSTATUS'                     ,mapi_prop_tag(PT_LONG,        0x5FFF));
-define('PR_RECIPIENT_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x5FFD));
-define('PR_RECIPIENT_TRACKSTATUS_TIME'                ,mapi_prop_tag(PT_SYSTIME,     0x5FFB));
-
-define('PR_EC_OUTOFOFFICE'                            ,mapi_prop_tag(PT_BOOLEAN,     0x6760));
-define('PR_EC_OUTOFOFFICE_MSG'                        ,mapi_prop_tag(PT_STRING8,     0x6761));
-define('PR_EC_OUTOFOFFICE_SUBJECT'                    ,mapi_prop_tag(PT_STRING8,     0x6762));
-define('PR_EC_OUTOFOFFICE_FROM'                       ,mapi_prop_tag(PT_SYSTIME,     0x6763));
-define('PR_EC_OUTOFOFFICE_UNTIL'                      ,mapi_prop_tag(PT_SYSTIME,     0x6764));
+define('PR_ICON_INDEX', mapi_prop_tag(PT_LONG, 0x1080));
+define('PR_LAST_VERB_EXECUTED', mapi_prop_tag(PT_LONG, 0x1081));
+define('PR_LAST_VERB_EXECUTION_TIME', mapi_prop_tag(PT_SYSTIME, 0x1082));
+define('PR_INTERNET_CPID', mapi_prop_tag(PT_LONG, 0x3FDE));
+define('PR_RECIPIENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x5FF7));
+define('PR_SEND_INTERNET_ENCODING', mapi_prop_tag(PT_LONG, 0x3FDE));
+define('PR_RECIPIENT_DISPLAY_NAME', mapi_prop_tag(PT_STRING8, 0x5FF6));
+define('PR_RECIPIENT_TRACKSTATUS', mapi_prop_tag(PT_LONG, 0x5FFF));
+define('PR_RECIPIENT_FLAGS', mapi_prop_tag(PT_LONG, 0x5FFD));
+define('PR_RECIPIENT_TRACKSTATUS_TIME', mapi_prop_tag(PT_SYSTIME, 0x5FFB));
+
+define('PR_EC_OUTOFOFFICE', mapi_prop_tag(PT_BOOLEAN, 0x6760));
+define('PR_EC_OUTOFOFFICE_MSG', mapi_prop_tag(PT_STRING8, 0x6761));
+define('PR_EC_OUTOFOFFICE_SUBJECT', mapi_prop_tag(PT_STRING8, 0x6762));
+define('PR_EC_OUTOFOFFICE_FROM', mapi_prop_tag(PT_SYSTIME, 0x6763));
+define('PR_EC_OUTOFOFFICE_UNTIL', mapi_prop_tag(PT_SYSTIME, 0x6764));
 
 /* quota support */
-define('PR_QUOTA_WARNING_THRESHOLD'                   ,mapi_prop_tag(PT_LONG,        0x6721));
-define('PR_QUOTA_SEND_THRESHOLD'                      ,mapi_prop_tag(PT_LONG,        0x6722));
-define('PR_QUOTA_RECEIVE_THRESHOLD'                   ,mapi_prop_tag(PT_LONG,        0x6723));
+define('PR_QUOTA_WARNING_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6721));
+define('PR_QUOTA_SEND_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6722));
+define('PR_QUOTA_RECEIVE_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6723));
 
 /* storage for the settings for the webaccess 6.xx */
-define('PR_EC_WEBACCESS_SETTINGS'                     ,mapi_prop_tag(PT_STRING8,     0x6770));
-define('PR_EC_RECIPIENT_HISTORY'                      ,mapi_prop_tag(PT_STRING8,     0x6771));
+define('PR_EC_WEBACCESS_SETTINGS', mapi_prop_tag(PT_STRING8, 0x6770));
+define('PR_EC_RECIPIENT_HISTORY', mapi_prop_tag(PT_STRING8, 0x6771));
 
 /* storage for the settings for the webaccess 7.xx */
-define('PR_EC_WEBACCESS_SETTINGS_JSON'                ,mapi_prop_tag(PT_STRING8,     0x6772));
-define('PR_EC_RECIPIENT_HISTORY_JSON'                 ,mapi_prop_tag(PT_STRING8,     0x6773));
+define('PR_EC_WEBACCESS_SETTINGS_JSON', mapi_prop_tag(PT_STRING8, 0x6772));
+define('PR_EC_RECIPIENT_HISTORY_JSON', mapi_prop_tag(PT_STRING8, 0x6773));
 
 /* The persistent settings are settings that will not be touched when the settings are reset */
-define('PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON'        ,mapi_prop_tag(PT_STRING8,     0x6774));
+define('PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON', mapi_prop_tag(PT_STRING8, 0x6774));
 
 /* statistics properties */
-define('PR_EC_STATSTABLE_SYSTEM'                      ,mapi_prop_tag(PT_OBJECT,      0x6730));
-define('PR_EC_STATSTABLE_SESSIONS'                    ,mapi_prop_tag(PT_OBJECT,      0x6731));
-define('PR_EC_STATSTABLE_USERS'                       ,mapi_prop_tag(PT_OBJECT,      0x6732));
-define('PR_EC_STATSTABLE_COMPANY'                     ,mapi_prop_tag(PT_OBJECT,      0x6733));
-
-define('PR_EC_STATS_SYSTEM_DESCRIPTION'               ,mapi_prop_tag(PT_STRING8,     0x6740));
-define('PR_EC_STATS_SYSTEM_VALUE'                     ,mapi_prop_tag(PT_STRING8,     0x6741));
-define('PR_EC_STATS_SESSION_ID'                       ,mapi_prop_tag(PT_LONG,        0x6742));
-define('PR_EC_STATS_SESSION_IPADDRESS'                ,mapi_prop_tag(PT_STRING8,     0x6743));
-define('PR_EC_STATS_SESSION_IDLETIME'                 ,mapi_prop_tag(PT_LONG,        0x6744));
-define('PR_EC_STATS_SESSION_CAPABILITY'               ,mapi_prop_tag(PT_LONG,        0x6745));
-define('PR_EC_STATS_SESSION_LOCKED'                   ,mapi_prop_tag(PT_BOOLEAN,     0x6746));
-define('PR_EC_STATS_SESSION_BUSYSTATES'               ,mapi_prop_tag(PT_MV_STRING8,  0x6747));
-define('PR_EC_COMPANY_NAME'                           ,mapi_prop_tag(PT_STRING8,     0x6748));
+define('PR_EC_STATSTABLE_SYSTEM', mapi_prop_tag(PT_OBJECT, 0x6730));
+define('PR_EC_STATSTABLE_SESSIONS', mapi_prop_tag(PT_OBJECT, 0x6731));
+define('PR_EC_STATSTABLE_USERS', mapi_prop_tag(PT_OBJECT, 0x6732));
+define('PR_EC_STATSTABLE_COMPANY', mapi_prop_tag(PT_OBJECT, 0x6733));
+
+define('PR_EC_STATS_SYSTEM_DESCRIPTION', mapi_prop_tag(PT_STRING8, 0x6740));
+define('PR_EC_STATS_SYSTEM_VALUE', mapi_prop_tag(PT_STRING8, 0x6741));
+define('PR_EC_STATS_SESSION_ID', mapi_prop_tag(PT_LONG, 0x6742));
+define('PR_EC_STATS_SESSION_IPADDRESS', mapi_prop_tag(PT_STRING8, 0x6743));
+define('PR_EC_STATS_SESSION_IDLETIME', mapi_prop_tag(PT_LONG, 0x6744));
+define('PR_EC_STATS_SESSION_CAPABILITY', mapi_prop_tag(PT_LONG, 0x6745));
+define('PR_EC_STATS_SESSION_LOCKED', mapi_prop_tag(PT_BOOLEAN, 0x6746));
+define('PR_EC_STATS_SESSION_BUSYSTATES', mapi_prop_tag(PT_MV_STRING8, 0x6747));
+define('PR_EC_COMPANY_NAME', mapi_prop_tag(PT_STRING8, 0x6748));
 
 /* user features */
-define('PR_EC_ENABLED_FEATURES'                       ,mapi_prop_tag(PT_MV_TSTRING,  0x67B3));
-define('PR_EC_DISABLED_FEATURES'                      ,mapi_prop_tag(PT_MV_TSTRING,  0x67B4));
+define('PR_EC_ENABLED_FEATURES', mapi_prop_tag(PT_MV_TSTRING, 0x67B3));
+define('PR_EC_DISABLED_FEATURES', mapi_prop_tag(PT_MV_TSTRING, 0x67B4));
 
 /* WA properties */
-define('PR_EC_WA_ATTACHMENT_HIDDEN_OVERRIDE'          ,mapi_prop_tag(PT_BOOLEAN,     0x67E0));
-define('PR_EC_WA_ATTACHMENT_ID'                       ,mapi_prop_tag(PT_STRING8,     0x67E1));
+define('PR_EC_WA_ATTACHMENT_HIDDEN_OVERRIDE', mapi_prop_tag(PT_BOOLEAN, 0x67E0));
+define('PR_EC_WA_ATTACHMENT_ID', mapi_prop_tag(PT_STRING8, 0x67E1));
 
 // edkmdb, rules properties
 #define pidSpecialMin                                   0x6670
-define('PR_RULE_ID'                                   ,mapi_prop_tag(PT_I8,          0x6674)); // only lower 32bits are used.
-define('PR_RULE_IDS'                                  ,mapi_prop_tag(PT_BINARY,      0x6675));
-define('PR_RULE_SEQUENCE'                             ,mapi_prop_tag(PT_LONG,        0x6676));
-define('PR_RULE_STATE'                                ,mapi_prop_tag(PT_LONG,        0x6677));
-define('PR_RULE_USER_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x6678));
-define('PR_RULE_CONDITION'                            ,mapi_prop_tag(PT_SRESTRICTION,0x6679));
-define('PR_RULE_ACTIONS'                              ,mapi_prop_tag(PT_ACTIONS,     0x6680));
-define('PR_RULE_PROVIDER'                             ,mapi_prop_tag(PT_STRING8,     0x6681));
-define('PR_RULE_NAME'                                 ,mapi_prop_tag(PT_TSTRING,     0x6682));
-define('PR_RULE_LEVEL'                                ,mapi_prop_tag(PT_LONG,        0x6683));
-define('PR_RULE_PROVIDER_DATA'                        ,mapi_prop_tag(PT_BINARY,      0x6684));
+define('PR_RULE_ID', mapi_prop_tag(PT_I8, 0x6674)); // only lower 32bits are used.
+define('PR_RULE_IDS', mapi_prop_tag(PT_BINARY, 0x6675));
+define('PR_RULE_SEQUENCE', mapi_prop_tag(PT_LONG, 0x6676));
+define('PR_RULE_STATE', mapi_prop_tag(PT_LONG, 0x6677));
+define('PR_RULE_USER_FLAGS', mapi_prop_tag(PT_LONG, 0x6678));
+define('PR_RULE_CONDITION', mapi_prop_tag(PT_SRESTRICTION, 0x6679));
+define('PR_RULE_ACTIONS', mapi_prop_tag(PT_ACTIONS, 0x6680));
+define('PR_RULE_PROVIDER', mapi_prop_tag(PT_STRING8, 0x6681));
+define('PR_RULE_NAME', mapi_prop_tag(PT_TSTRING, 0x6682));
+define('PR_RULE_LEVEL', mapi_prop_tag(PT_LONG, 0x6683));
+define('PR_RULE_PROVIDER_DATA', mapi_prop_tag(PT_BINARY, 0x6684));
 
 // edkmdb, ICS properties
-define('PR_SOURCE_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x65E0));
-define('PR_PARENT_SOURCE_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x65E1));
-define('PR_CHANGE_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x65E2));
-define('PR_PREDECESSOR_CHANGE_LIST'                   ,mapi_prop_tag(PT_BINARY,      0x65E3));
+define('PR_SOURCE_KEY', mapi_prop_tag(PT_BINARY, 0x65E0));
+define('PR_PARENT_SOURCE_KEY', mapi_prop_tag(PT_BINARY, 0x65E1));
+define('PR_CHANGE_KEY', mapi_prop_tag(PT_BINARY, 0x65E2));
+define('PR_PREDECESSOR_CHANGE_LIST', mapi_prop_tag(PT_BINARY, 0x65E3));
 
 
-define('PR_PROCESS_MEETING_REQUESTS'                  ,mapi_prop_tag(PT_BOOLEAN,     0x686D));
-define('PR_DECLINE_RECURRING_MEETING_REQUESTS'        ,mapi_prop_tag(PT_BOOLEAN,     0x686E));
-define('PR_DECLINE_CONFLICTING_MEETING_REQUESTS'      ,mapi_prop_tag(PT_BOOLEAN,     0x686F));
+define('PR_PROCESS_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686D));
+define('PR_DECLINE_RECURRING_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686E));
+define('PR_DECLINE_CONFLICTING_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686F));
 
 
-define('PR_PROPOSEDNEWTIME'                           ,mapi_prop_tag(PT_BOOLEAN,     0x5FE1));
-define('PR_PROPOSENEWTIME_START'                      ,mapi_prop_tag(PT_SYSTIME,     0x5FE3));
-define('PR_PROPOSENEWTIME_END'                        ,mapi_prop_tag(PT_SYSTIME,     0x5FE4));
+define('PR_PROPOSEDNEWTIME', mapi_prop_tag(PT_BOOLEAN, 0x5FE1));
+define('PR_PROPOSENEWTIME_START', mapi_prop_tag(PT_SYSTIME, 0x5FE3));
+define('PR_PROPOSENEWTIME_END', mapi_prop_tag(PT_SYSTIME, 0x5FE4));
 
 // property for sort the recoverable items.
-define('PR_DELETED_ON'                                ,mapi_prop_tag(PT_SYSTIME,     0x668F));
+define('PR_DELETED_ON', mapi_prop_tag(PT_SYSTIME, 0x668F));
 
-define('PR_PROCESSED'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x7D01));
+define('PR_PROCESSED', mapi_prop_tag(PT_BOOLEAN, 0x7D01));
 
 // Delegates properties
-define('PR_DELEGATES_SEE_PRIVATE'                     ,mapi_prop_tag(PT_MV_LONG,     0x686B));
-define('PR_SCHDINFO_DELEGATE_ENTRYIDS'                ,mapi_prop_tag(PT_MV_BINARY,   0x6845));
-define('PR_SCHDINFO_DELEGATE_NAMES'                   ,mapi_prop_tag(PT_MV_STRING8,  0x6844));
-define('PR_DELEGATED_BY_RULE'                         ,mapi_prop_tag(PT_BOOLEAN,     0x3FE3));
+define('PR_DELEGATES_SEE_PRIVATE', mapi_prop_tag(PT_MV_LONG, 0x686B));
+define('PR_SCHDINFO_DELEGATE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6845));
+define('PR_SCHDINFO_DELEGATE_NAMES', mapi_prop_tag(PT_MV_STRING8, 0x6844));
+define('PR_DELEGATED_BY_RULE', mapi_prop_tag(PT_BOOLEAN, 0x3FE3));
 
 // properties required in Reply mail.
-define('PR_INTERNET_REFERENCES'                       ,mapi_prop_tag(PT_STRING8,     0x1039));
-define('PR_IN_REPLY_TO_ID'                            ,mapi_prop_tag(PT_STRING8,     0x1042));
-define('PR_INTERNET_MESSAGE_ID'                       ,mapi_prop_tag(PT_STRING8,     0x1035));
+define('PR_INTERNET_REFERENCES', mapi_prop_tag(PT_STRING8, 0x1039));
+define('PR_IN_REPLY_TO_ID', mapi_prop_tag(PT_STRING8, 0x1042));
+define('PR_INTERNET_MESSAGE_ID', mapi_prop_tag(PT_STRING8, 0x1035));
 
 // for hidden folders
-define('PR_ATTR_HIDDEN'                               ,mapi_prop_tag(PT_BOOLEAN,     0x10F4));
+define('PR_ATTR_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x10F4));
 
 /**
  * Addressbook detail properties.
  * It is not defined by MAPI, but to keep in sync with the interface of outlook we have to use these
  * properties. Outlook actually uses these properties for it's addressbook details.
  */
-define('PR_HOME2_TELEPHONE_NUMBER_MV'                 ,mapi_prop_tag(PT_MV_TSTRING,  0x3A2F));
-define('PR_BUSINESS2_TELEPHONE_NUMBER_MV'             ,mapi_prop_tag(PT_MV_TSTRING,  0x3A1B));
-define('PR_EMS_AB_PROXY_ADDRESSES'                    ,mapi_prop_tag(PT_TSTRING,     0x800F));
-define('PR_EMS_AB_PROXY_ADDRESSES_MV'                 ,mapi_prop_tag(PT_MV_TSTRING,  0x800F));
-define('PR_EMS_AB_MANAGER'                            ,mapi_prop_tag(PT_BINARY,      0x8005));
-define('PR_EMS_AB_REPORTS'                            ,mapi_prop_tag(PT_BINARY,      0x800E));
-define('PR_EMS_AB_REPORTS_MV'                         ,mapi_prop_tag(PT_MV_BINARY,   0x800E));
-define('PR_EMS_AB_IS_MEMBER_OF_DL'                    ,mapi_prop_tag(PT_MV_BINARY,   0x8008));
-define('PR_EMS_AB_OWNER'                              ,mapi_prop_tag(PT_BINARY,      0x800C));
-define('PR_EMS_AB_ROOM_CAPACITY'                      ,mapi_prop_tag(PT_LONG,        0x0807));
-define('PR_EMS_AB_TAGGED_X509_CERT'                   ,mapi_prop_tag(PT_MV_BINARY,   0x8C6A));
-define('PR_EMS_AB_THUMBNAIL_PHOTO'                    ,mapi_prop_tag(PT_BINARY,      0x8C9E));
-
-define('PR_EC_ARCHIVE_SERVERS'                        ,mapi_prop_tag(PT_MV_TSTRING,  0x67c4));
+define('PR_HOME2_TELEPHONE_NUMBER_MV', mapi_prop_tag(PT_MV_TSTRING, 0x3A2F));
+define('PR_BUSINESS2_TELEPHONE_NUMBER_MV', mapi_prop_tag(PT_MV_TSTRING, 0x3A1B));
+define('PR_EMS_AB_PROXY_ADDRESSES', mapi_prop_tag(PT_TSTRING, 0x800F));
+define('PR_EMS_AB_PROXY_ADDRESSES_MV', mapi_prop_tag(PT_MV_TSTRING, 0x800F));
+define('PR_EMS_AB_MANAGER', mapi_prop_tag(PT_BINARY, 0x8005));
+define('PR_EMS_AB_REPORTS', mapi_prop_tag(PT_BINARY, 0x800E));
+define('PR_EMS_AB_REPORTS_MV', mapi_prop_tag(PT_MV_BINARY, 0x800E));
+define('PR_EMS_AB_IS_MEMBER_OF_DL', mapi_prop_tag(PT_MV_BINARY, 0x8008));
+define('PR_EMS_AB_OWNER', mapi_prop_tag(PT_BINARY, 0x800C));
+define('PR_EMS_AB_ROOM_CAPACITY', mapi_prop_tag(PT_LONG, 0x0807));
+define('PR_EMS_AB_TAGGED_X509_CERT', mapi_prop_tag(PT_MV_BINARY, 0x8C6A));
+define('PR_EMS_AB_THUMBNAIL_PHOTO', mapi_prop_tag(PT_BINARY, 0x8C9E));
+
+define('PR_EC_ARCHIVE_SERVERS', mapi_prop_tag(PT_MV_TSTRING, 0x67c4));
 
 /* grommunio contacts provider properties */
-define('PR_ZC_CONTACT_STORE_ENTRYIDS'                 ,mapi_prop_tag(PT_MV_BINARY,   0x6711));
-define('PR_ZC_CONTACT_FOLDER_ENTRYIDS'                ,mapi_prop_tag(PT_MV_BINARY,   0x6712));
-define('PR_ZC_CONTACT_FOLDER_NAMES'                   ,mapi_prop_tag(PT_MV_TSTRING,  0x6713));
+define('PR_ZC_CONTACT_STORE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6711));
+define('PR_ZC_CONTACT_FOLDER_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6712));
+define('PR_ZC_CONTACT_FOLDER_NAMES', mapi_prop_tag(PT_MV_TSTRING, 0x6713));
 
 /* grommunio specific properties for optimization of imap functionality */
-define('PR_EC_IMAP_EMAIL'                             ,mapi_prop_tag(PT_BINARY,      0x678C)); //the complete rfc822 email
-define('PR_EC_IMAP_EMAIL_SIZE'                        ,mapi_prop_tag(PT_LONG,        0x678D));
-define('PR_EC_IMAP_BODY'                              ,mapi_prop_tag(PT_STRING8,     0x678E)); //simplified bodystructure (mostly unused by clients)
-define('PR_EC_IMAP_BODYSTRUCTURE'                     ,mapi_prop_tag(PT_STRING8,     0x678F)); //extended bodystructure (often used by clients)
+define('PR_EC_IMAP_EMAIL', mapi_prop_tag(PT_BINARY, 0x678C)); //the complete rfc822 email
+define('PR_EC_IMAP_EMAIL_SIZE', mapi_prop_tag(PT_LONG, 0x678D));
+define('PR_EC_IMAP_BODY', mapi_prop_tag(PT_STRING8, 0x678E)); //simplified bodystructure (mostly unused by clients)
+define('PR_EC_IMAP_BODYSTRUCTURE', mapi_prop_tag(PT_STRING8, 0x678F)); //extended bodystructure (often used by clients)
 
 /* Folder properties for unread counters */
-define('PR_LOCAL_COMMIT_TIME_MAX'                     ,mapi_prop_tag(PT_SYSTIME,     0x670A));
-define('PR_DELETED_MSG_COUNT'                         ,mapi_prop_tag(PT_LONG,        0x6640));
+define('PR_LOCAL_COMMIT_TIME_MAX', mapi_prop_tag(PT_SYSTIME, 0x670A));
+define('PR_DELETED_MSG_COUNT', mapi_prop_tag(PT_LONG, 0x6640));
 
 /* Favorites folder properties*/
-define('PR_WLINK_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x684C));
-define('PR_WLINK_FLAGS'                               ,mapi_prop_tag(PT_LONG,        0x684A));
-define('PR_WLINK_ORDINAL'                             ,mapi_prop_tag(PT_BINARY,      0x684B));
-define('PR_WLINK_STORE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x684E));
-define('PR_WLINK_TYPE'                                ,mapi_prop_tag(PT_LONG,        0x6849));
-define('PR_WLINK_SECTION'                             ,mapi_prop_tag(PT_LONG,        0x6852));
-define('PR_WLINK_RECKEY'                              ,mapi_prop_tag(PT_BINARY,      0x684D));
-define('PR_WB_SF_ID'                                  ,mapi_prop_tag(PT_BINARY,      0x6842));
+define('PR_WLINK_ENTRYID', mapi_prop_tag(PT_BINARY, 0x684C));
+define('PR_WLINK_FLAGS', mapi_prop_tag(PT_LONG, 0x684A));
+define('PR_WLINK_ORDINAL', mapi_prop_tag(PT_BINARY, 0x684B));
+define('PR_WLINK_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x684E));
+define('PR_WLINK_TYPE', mapi_prop_tag(PT_LONG, 0x6849));
+define('PR_WLINK_SECTION', mapi_prop_tag(PT_LONG, 0x6852));
+define('PR_WLINK_RECKEY', mapi_prop_tag(PT_BINARY, 0x684D));
+define('PR_WB_SF_ID', mapi_prop_tag(PT_BINARY, 0x6842));
 
 /* Search folder properties */
-define('PR_EC_SUGGESTION'                             ,mapi_prop_tag(PT_TSTRING,     0x6707));
+define('PR_EC_SUGGESTION', mapi_prop_tag(PT_TSTRING, 0x6707));
 
-define('PR_EC_BODY_FILTERED'                          ,mapi_prop_tag(PT_BINARY, 0x6791));
-define('PR_PROPOSEDNEWTIME_START'                     ,PR_PROPOSENEWTIME_START);
-define('PR_PROPOSEDNEWTIME_END'                       ,PR_PROPOSENEWTIME_END);
+define('PR_EC_BODY_FILTERED', mapi_prop_tag(PT_BINARY, 0x6791));
+define('PR_PROPOSEDNEWTIME_START', PR_PROPOSENEWTIME_START);
+define('PR_PROPOSEDNEWTIME_END', PR_PROPOSENEWTIME_END);

Braces +2 added lines, -1 removed lines

@@ -5,8 +5,9 @@
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-if (!function_exists("mapi_prop_tag"))
+if (!function_exists("mapi_prop_tag")) {
     throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
+}
 
 define('PR_ACKNOWLEDGEMENT_MODE'                      ,mapi_prop_tag(PT_LONG,        0x0001));
 define('PR_ALTERNATE_RECIPIENT_ALLOWED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0002));

mapi/class.freebusypublish.php

Indentation +115 added lines, -115 removed lines

@@ -83,116 +83,116 @@ 
         $calendaritems = Array();
 
         $restrict = Array(RES_OR,
-                             Array(
-                                   // OR
-                                   // (item[start] >= start && item[start] <= end)
-                                   Array(RES_AND,
-                                         Array(
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_GE,
-                                                           ULPROPTAG => $this->proptags["startdate"],
-                                                           VALUE => $start
-                                                           )
-                                                     ),
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_LE,
-                                                           ULPROPTAG => $this->proptags["startdate"],
-                                                           VALUE => $end
-                                                           )
-                                                     )
-                                               )
-                                         ),
-                                   // OR
-                                   // (item[end]   >= start && item[end]   <= end)
-                                   Array(RES_AND,
-                                         Array(
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_GE,
-                                                           ULPROPTAG => $this->proptags["duedate"],
-                                                           VALUE => $start
-                                                           )
-                                                     ),
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_LE,
-                                                           ULPROPTAG => $this->proptags["duedate"],
-                                                           VALUE => $end
-                                                           )
-                                                     )
-                                               )
-                                         ),
-                                   // OR
-                                   // (item[start] <  start && item[end]   >  end)
-                                   Array(RES_AND,
-                                         Array(
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_LT,
-                                                           ULPROPTAG => $this->proptags["startdate"],
-                                                           VALUE => $start
-                                                           )
-                                                     ),
-                                               Array(RES_PROPERTY,
-                                                     Array(RELOP => RELOP_GT,
-                                                           ULPROPTAG => $this->proptags["duedate"],
-                                                           VALUE => $end
-                                                           )
-                                                     )
-                                               )
-                                         ),
-                                   // OR
-                                   Array(RES_OR,
-                                         Array(
-                                               // OR
-                                               // (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start)
-                                               Array(RES_AND,
-                                                     Array(
-                                                           Array(RES_EXIST,
-                                                                 Array(ULPROPTAG => $this->proptags["enddate_recurring"],
-                                                                       )
-                                                                 ),
-                                                           Array(RES_PROPERTY,
-                                                                 Array(RELOP => RELOP_EQ,
-                                                                       ULPROPTAG => $this->proptags["recurring"],
-                                                                       VALUE => true
-                                                                       )
-                                                                 ),
-                                                           Array(RES_PROPERTY,
-                                                                 Array(RELOP => RELOP_GE,
-                                                                       ULPROPTAG => $this->proptags["enddate_recurring"],
-                                                                       VALUE => $start
-                                                                       )
-                                                                 )
-                                                           )
-                                                     ),
-                                               // OR
-                                               // (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
-                                               Array(RES_AND,
-                                                     Array(
-                                                           Array(RES_NOT,
-                                                                 Array(
-                                                                       Array(RES_EXIST,
-                                                                             Array(ULPROPTAG => $this->proptags["enddate_recurring"]
-                                                                                   )
-                                                                             )
-                                                                       )
-                                                                 ),
-                                                           Array(RES_PROPERTY,
-                                                                 Array(RELOP => RELOP_LE,
-                                                                       ULPROPTAG => $this->proptags["startdate"],
-                                                                       VALUE => $end
-                                                                       )
-                                                                 ),
-                                                           Array(RES_PROPERTY,
-                                                                 Array(RELOP => RELOP_EQ,
-                                                                       ULPROPTAG => $this->proptags["recurring"],
-                                                                       VALUE => true
-                                                                       )
-                                                                 )
-                                                           )
-                                                     )
-                                               )
-                                         ) // EXISTS OR
-                                   )
-                             );        // global OR
+                                Array(
+                                    // OR
+                                    // (item[start] >= start && item[start] <= end)
+                                    Array(RES_AND,
+                                            Array(
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_GE,
+                                                            ULPROPTAG => $this->proptags["startdate"],
+                                                            VALUE => $start
+                                                            )
+                                                        ),
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_LE,
+                                                            ULPROPTAG => $this->proptags["startdate"],
+                                                            VALUE => $end
+                                                            )
+                                                        )
+                                                )
+                                            ),
+                                    // OR
+                                    // (item[end]   >= start && item[end]   <= end)
+                                    Array(RES_AND,
+                                            Array(
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_GE,
+                                                            ULPROPTAG => $this->proptags["duedate"],
+                                                            VALUE => $start
+                                                            )
+                                                        ),
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_LE,
+                                                            ULPROPTAG => $this->proptags["duedate"],
+                                                            VALUE => $end
+                                                            )
+                                                        )
+                                                )
+                                            ),
+                                    // OR
+                                    // (item[start] <  start && item[end]   >  end)
+                                    Array(RES_AND,
+                                            Array(
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_LT,
+                                                            ULPROPTAG => $this->proptags["startdate"],
+                                                            VALUE => $start
+                                                            )
+                                                        ),
+                                                Array(RES_PROPERTY,
+                                                        Array(RELOP => RELOP_GT,
+                                                            ULPROPTAG => $this->proptags["duedate"],
+                                                            VALUE => $end
+                                                            )
+                                                        )
+                                                )
+                                            ),
+                                    // OR
+                                    Array(RES_OR,
+                                            Array(
+                                                // OR
+                                                // (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start)
+                                                Array(RES_AND,
+                                                        Array(
+                                                            Array(RES_EXIST,
+                                                                    Array(ULPROPTAG => $this->proptags["enddate_recurring"],
+                                                                        )
+                                                                    ),
+                                                            Array(RES_PROPERTY,
+                                                                    Array(RELOP => RELOP_EQ,
+                                                                        ULPROPTAG => $this->proptags["recurring"],
+                                                                        VALUE => true
+                                                                        )
+                                                                    ),
+                                                            Array(RES_PROPERTY,
+                                                                    Array(RELOP => RELOP_GE,
+                                                                        ULPROPTAG => $this->proptags["enddate_recurring"],
+                                                                        VALUE => $start
+                                                                        )
+                                                                    )
+                                                            )
+                                                        ),
+                                                // OR
+                                                // (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
+                                                Array(RES_AND,
+                                                        Array(
+                                                            Array(RES_NOT,
+                                                                    Array(
+                                                                        Array(RES_EXIST,
+                                                                                Array(ULPROPTAG => $this->proptags["enddate_recurring"]
+                                                                                    )
+                                                                                )
+                                                                        )
+                                                                    ),
+                                                            Array(RES_PROPERTY,
+                                                                    Array(RELOP => RELOP_LE,
+                                                                        ULPROPTAG => $this->proptags["startdate"],
+                                                                        VALUE => $end
+                                                                        )
+                                                                    ),
+                                                            Array(RES_PROPERTY,
+                                                                    Array(RELOP => RELOP_EQ,
+                                                                        ULPROPTAG => $this->proptags["recurring"],
+                                                                        VALUE => true
+                                                                        )
+                                                                    )
+                                                            )
+                                                        )
+                                                )
+                                            ) // EXISTS OR
+                                    )
+                                );        // global OR
 
         $contents = mapi_folder_getcontentstable($this->calendar);
         mapi_table_restrict($contents, $restrict);
@@ -266,8 +266,8 @@ 
     }
 
     /**
-    * Sorts by timestamp, if equal, then end before start
-    */
+     * Sorts by timestamp, if equal, then end before start
+     */
     function cmp($a, $b)
     {
         if ($a["time"] == $b["time"]) {
@@ -281,9 +281,9 @@ 
     }
 
     /**
-    * Function mergeItems
-    * @author Steve Hardy
-    */
+     * Function mergeItems
+     * @author Steve Hardy
+     */
     function mergeItemsFB($items)
     {
         $merged = Array();

Spacing +14 added lines, -14 removed lines

@@ -192,23 +192,23 @@ 
                                                )
                                          ) // EXISTS OR
                                    )
-                             );        // global OR
+                             ); // global OR
 
         $contents = mapi_folder_getcontentstable($this->calendar);
         mapi_table_restrict($contents, $restrict);
 
-        while(1) {
+        while (1) {
             $rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
 
-            if(!is_array($rows))
+            if (!is_array($rows))
                 break;
 
-            if(empty($rows))
+            if (empty($rows))
                 break;
 
             foreach ($rows as $row) {
                 $occurrences = Array();
-                if(isset($row[$this->proptags['recurring']]) && $row[$this->proptags['recurring']]) {
+                if (isset($row[$this->proptags['recurring']]) && $row[$this->proptags['recurring']]) {
                     $recur = new Recurrence($this->store, $row);
 
                     $occurrences = $recur->getItems($starttime, $length);
@@ -241,14 +241,14 @@ 
         try {
             $fbsupport = mapi_freebusysupport_open($this->session, $this->store);
         } catch (MAPIException $e) {
-            if($e->getCode() == MAPI_E_NOT_FOUND) {
+            if ($e->getCode() == MAPI_E_NOT_FOUND) {
                 $e->setHandled();
                 ZLog::Write(LOGLEVEL_WARN, "Error in opening freebusysupport object.");
             }
         }
 
         // Open updater for this user
-        if(isset($fbsupport) && $fbsupport) {
+        if (isset($fbsupport) && $fbsupport) {
             $updaters = mapi_freebusysupport_loadupdate($fbsupport, Array($this->entryid));
 
             $updater = $updaters[0];
@@ -256,7 +256,7 @@ 
             // Send the data
             mapi_freebusyupdate_reset($updater);
             mapi_freebusyupdate_publish($updater, $freebusy);
-            mapi_freebusyupdate_savechanges($updater, $start-24*60*60, $end);
+            mapi_freebusyupdate_savechanges($updater, $start - 24 * 60 * 60, $end);
 
             // We're finished
             mapi_freebusysupport_close($fbsupport);
@@ -271,9 +271,9 @@ 
     function cmp($a, $b)
     {
         if ($a["time"] == $b["time"]) {
-            if($a["type"] < $b["type"])
+            if ($a["type"] < $b["type"])
                 return 1;
-            if($a["type"] > $b["type"])
+            if ($a["type"] > $b["type"])
                 return -1;
             return 0;
         }
@@ -293,7 +293,7 @@ 
         $level = 0;
         $laststart = null;
 
-        foreach($items as $item)
+        foreach ($items as $item)
         {
             $ts["type"] = 0;
             $ts["time"] = $item[$this->proptags["startdate"]];
@@ -311,7 +311,7 @@ 
         usort($timestamps, Array($this, "cmp"));
         $laststart = 0; // seb added
 
-        foreach($timestamps as $ts)
+        foreach ($timestamps as $ts)
         {
             switch ($ts["type"])
             {
@@ -322,7 +322,7 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
+                        if ($newitem["status"] > 0)
                             $merged[] = $newitem;
                     }
 
@@ -340,7 +340,7 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
+                        if ($newitem["status"] > 0)
                             $merged[] = $newitem;
                     }
 

Braces +20 added lines, -14 removed lines

@@ -200,11 +200,13 @@ 
         while(1) {
             $rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
 
-            if(!is_array($rows))
-                break;
+            if(!is_array($rows)) {
+                            break;
+            }
 
-            if(empty($rows))
-                break;
+            if(empty($rows)) {
+                            break;
+            }
 
             foreach ($rows as $row) {
                 $occurrences = Array();
@@ -260,9 +262,9 @@ 
 
             // We're finished
             mapi_freebusysupport_close($fbsupport);
+        } else {
+                    ZLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
         }
-        else
-            ZLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
     }
 
     /**
@@ -271,10 +273,12 @@ 
     function cmp($a, $b)
     {
         if ($a["time"] == $b["time"]) {
-            if($a["type"] < $b["type"])
-                return 1;
-            if($a["type"] > $b["type"])
-                return -1;
+            if($a["type"] < $b["type"]) {
+                            return 1;
+            }
+            if($a["type"] > $b["type"]) {
+                            return -1;
+            }
             return 0;
         }
         return ($a["time"] > $b["time"] ? 1 : -1);
@@ -322,8 +326,9 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
-                            $merged[] = $newitem;
+                        if($newitem["status"] > 0) {
+                                                    $merged[] = $newitem;
+                        }
                     }
 
                     $level++;
@@ -340,8 +345,9 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
-                            $merged[] = $newitem;
+                        if($newitem["status"] > 0) {
+                                                    $merged[] = $newitem;
+                        }
                     }
 
                     $level--;

mapi/mapidefs.php

Indentation +1 added lines, -1 removed lines

@@ -643,7 +643,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 +449 added lines, -449 removed lines

@@ -6,110 +6,110 @@ 
  */
 
 /* Resource types as defined in main.h of the mapi extension */
-define('RESOURCE_SESSION'                        ,'MAPI Session');
-define('RESOURCE_TABLE'                          ,'MAPI Table');
-define('RESOURCE_ROWSET'                         ,'MAPI Rowset');
-define('RESOURCE_MSGSTORE'                       ,'MAPI Message Store');
-define('RESOURCE_FOLDER'                         ,'MAPI Folder');
-define('RESOURCE_MESSAGE'                        ,'MAPI Message');
-define('RESOURCE_ATTACHMENT'                     ,'MAPI Attachment');
+define('RESOURCE_SESSION', 'MAPI Session');
+define('RESOURCE_TABLE', 'MAPI Table');
+define('RESOURCE_ROWSET', 'MAPI Rowset');
+define('RESOURCE_MSGSTORE', 'MAPI Message Store');
+define('RESOURCE_FOLDER', 'MAPI Folder');
+define('RESOURCE_MESSAGE', 'MAPI Message');
+define('RESOURCE_ATTACHMENT', 'MAPI Attachment');
 
 
 /* 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('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('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) */
 /* Changes are likely to these numbers, and to their structures. */
 
 /* Alternate property type names for ease of use */
-define('PT_SHORT'                                ,PT_I2);
-define('PT_I4'                                   ,PT_LONG);
-define('PT_FLOAT'                                ,PT_R4);
-define('PT_R8'                                   ,PT_DOUBLE);
-define('PT_LONGLONG'                             ,PT_I8);
+define('PT_SHORT', PT_I2);
+define('PT_I4', PT_LONG);
+define('PT_FLOAT', PT_R4);
+define('PT_R8', PT_DOUBLE);
+define('PT_LONGLONG', PT_I8);
 
 
-define('PT_TSTRING'                              ,PT_STRING8);
+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);
+define('PT_MV_TSTRING', PT_MV_STRING8);
 /* bit 0: set if descending, clear if ascending */
 
-define('TABLE_SORT_ASCEND'                       ,(0x00000000));
-define('TABLE_SORT_DESCEND'                      ,(0x00000001));
-define('TABLE_SORT_COMBINE'                      ,(0x00000002));
+define('TABLE_SORT_ASCEND', (0x00000000));
+define('TABLE_SORT_DESCEND', (0x00000001));
+define('TABLE_SORT_COMBINE', (0x00000002));
 
 /* Bookmarks in Table */
-define('BOOKMARK_BEGINNING'                      , 0); /* Before first row */
-define('BOOKMARK_CURRENT'                        , 1); /* Before current row */
-define('BOOKMARK_END'                            , 2); /* After last row */
+define('BOOKMARK_BEGINNING', 0); /* Before first row */
+define('BOOKMARK_CURRENT', 1); /* Before current row */
+define('BOOKMARK_END', 2); /* After last row */
 
-define('MAPI_UNICODE'                            ,0x80000000);
+define('MAPI_UNICODE', 0x80000000);
 
 /* IMAPIFolder Interface --------------------------------------------------- */
-define('CONVENIENT_DEPTH'                        ,0x00000001);
-define('SEARCH_RUNNING'                          ,0x00000001);
-define('SEARCH_REBUILD'                          ,0x00000002);
-define('SEARCH_RECURSIVE'                        ,0x00000004);
-define('SEARCH_FOREGROUND'                       ,0x00000008);
-define('STOP_SEARCH'                             ,0x00000001);
-define('RESTART_SEARCH'                          ,0x00000002);
-define('RECURSIVE_SEARCH'                        ,0x00000004);
-define('SHALLOW_SEARCH'                          ,0x00000008);
-define('FOREGROUND_SEARCH'                       ,0x00000010);
-define('BACKGROUND_SEARCH'                       ,0x00000020);
+define('CONVENIENT_DEPTH', 0x00000001);
+define('SEARCH_RUNNING', 0x00000001);
+define('SEARCH_REBUILD', 0x00000002);
+define('SEARCH_RECURSIVE', 0x00000004);
+define('SEARCH_FOREGROUND', 0x00000008);
+define('STOP_SEARCH', 0x00000001);
+define('RESTART_SEARCH', 0x00000002);
+define('RECURSIVE_SEARCH', 0x00000004);
+define('SHALLOW_SEARCH', 0x00000008);
+define('FOREGROUND_SEARCH', 0x00000010);
+define('BACKGROUND_SEARCH', 0x00000020);
 
 /* IMAPIFolder folder type (enum) */
 
-define('FOLDER_ROOT'                             ,0x00000000);
-define('FOLDER_GENERIC'                          ,0x00000001);
-define('FOLDER_SEARCH'                           ,0x00000002);
+define('FOLDER_ROOT', 0x00000000);
+define('FOLDER_GENERIC', 0x00000001);
+define('FOLDER_SEARCH', 0x00000002);
 
 /* CreateMessage */
 /****** MAPI_DEFERRED_ERRORS    ((ULONG) 0x00000008) below */
@@ -117,188 +117,188 @@ 
 
 /* CopyMessages */
 
-define('MESSAGE_MOVE'                            ,0x00000001);
-define('MESSAGE_DIALOG'                          ,0x00000002);
+define('MESSAGE_MOVE', 0x00000001);
+define('MESSAGE_DIALOG', 0x00000002);
 /****** MAPI_DECLINE_OK         ((ULONG) 0x00000004) above */
 
 /* CreateFolder */
 
-define('OPEN_IF_EXISTS'                          ,0x00000001);
+define('OPEN_IF_EXISTS', 0x00000001);
 /****** MAPI_DEFERRED_ERRORS    ((ULONG) 0x00000008) below */
 /****** MAPI_UNICODE            ((ULONG) 0x80000000) above */
 
 /* DeleteFolder */
 
-define('DEL_MESSAGES'                            ,0x00000001);
-define('FOLDER_DIALOG'                           ,0x00000002);
-define('DEL_FOLDERS'                             ,0x00000004);
+define('DEL_MESSAGES', 0x00000001);
+define('FOLDER_DIALOG', 0x00000002);
+define('DEL_FOLDERS', 0x00000004);
 
 /* EmptyFolder */
-define('DEL_ASSOCIATED'                          ,0x00000008);
+define('DEL_ASSOCIATED', 0x00000008);
 
 /* CopyFolder */
 
-define('FOLDER_MOVE'                             ,0x00000001);
+define('FOLDER_MOVE', 0x00000001);
 /****** FOLDER_DIALOG           ((ULONG) 0x00000002) above */
 /****** MAPI_DECLINE_OK         ((ULONG) 0x00000004) above */
-define('COPY_SUBFOLDERS'                         ,0x00000010);
+define('COPY_SUBFOLDERS', 0x00000010);
 /****** MAPI_UNICODE            ((ULONG) 0x80000000) above */
 
 
 /* SetReadFlags */
 
-define('SUPPRESS_RECEIPT'                        ,0x00000001);
+define('SUPPRESS_RECEIPT', 0x00000001);
 /****** FOLDER_DIALOG           ((ULONG) 0x00000002) above */
-define('CLEAR_READ_FLAG'                         ,0x00000004);
+define('CLEAR_READ_FLAG', 0x00000004);
 /****** MAPI_DEFERRED_ERRORS    ((ULONG) 0x00000008) below */
-define('GENERATE_RECEIPT_ONLY'                   ,0x00000010);
-define('CLEAR_RN_PENDING'                        ,0x00000020);
-define('CLEAR_NRN_PENDING'                       ,0x00000040);
+define('GENERATE_RECEIPT_ONLY', 0x00000010);
+define('CLEAR_RN_PENDING', 0x00000020);
+define('CLEAR_NRN_PENDING', 0x00000040);
 
 /* Flags defined in PR_MESSAGE_FLAGS */
 
-define('MSGFLAG_READ'                            ,0x00000001);
-define('MSGFLAG_UNMODIFIED'                      ,0x00000002);
-define('MSGFLAG_SUBMIT'                          ,0x00000004);
-define('MSGFLAG_UNSENT'                          ,0x00000008);
-define('MSGFLAG_HASATTACH'                       ,0x00000010);
-define('MSGFLAG_FROMME'                          ,0x00000020);
-define('MSGFLAG_ASSOCIATED'                      ,0x00000040);
-define('MSGFLAG_RESEND'                          ,0x00000080);
-define('MSGFLAG_RN_PENDING'                      ,0x00000100);
-define('MSGFLAG_NRN_PENDING'                     ,0x00000200);
+define('MSGFLAG_READ', 0x00000001);
+define('MSGFLAG_UNMODIFIED', 0x00000002);
+define('MSGFLAG_SUBMIT', 0x00000004);
+define('MSGFLAG_UNSENT', 0x00000008);
+define('MSGFLAG_HASATTACH', 0x00000010);
+define('MSGFLAG_FROMME', 0x00000020);
+define('MSGFLAG_ASSOCIATED', 0x00000040);
+define('MSGFLAG_RESEND', 0x00000080);
+define('MSGFLAG_RN_PENDING', 0x00000100);
+define('MSGFLAG_NRN_PENDING', 0x00000200);
 
 /* GetMessageStatus */
 
-define('MSGSTATUS_HIGHLIGHTED'                   ,0x00000001);
-define('MSGSTATUS_TAGGED'                        ,0x00000002);
-define('MSGSTATUS_HIDDEN'                        ,0x00000004);
-define('MSGSTATUS_DELMARKED'                     ,0x00000008);
+define('MSGSTATUS_HIGHLIGHTED', 0x00000001);
+define('MSGSTATUS_TAGGED', 0x00000002);
+define('MSGSTATUS_HIDDEN', 0x00000004);
+define('MSGSTATUS_DELMARKED', 0x00000008);
 
 /* Bits for remote message status */
 
-define('MSGSTATUS_REMOTE_DOWNLOAD'               ,0x00001000);
-define('MSGSTATUS_REMOTE_DELETE'                 ,0x00002000);
+define('MSGSTATUS_REMOTE_DOWNLOAD', 0x00001000);
+define('MSGSTATUS_REMOTE_DELETE', 0x00002000);
 
 /* SaveContentsSort */
 
-define('RECURSIVE_SORT'                          ,0x00000002);
+define('RECURSIVE_SORT', 0x00000002);
 
 /* PR_STATUS property */
 
-define('FLDSTATUS_HIGHLIGHTED'                   ,0x00000001);
-define('FLDSTATUS_TAGGED'                        ,0x00000002);
-define('FLDSTATUS_HIDDEN'                        ,0x00000004);
-define('FLDSTATUS_DELMARKED'                     ,0x00000008);
+define('FLDSTATUS_HIGHLIGHTED', 0x00000001);
+define('FLDSTATUS_TAGGED', 0x00000002);
+define('FLDSTATUS_HIDDEN', 0x00000004);
+define('FLDSTATUS_DELMARKED', 0x00000008);
 
 
 /* IMAPIStatus Interface --------------------------------------------------- */
 
 /* 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('STATUS_VALIDATE_STATE'                   ,0x00000001);
-define('STATUS_SETTINGS_DIALOG'                  ,0x00000002);
-define('STATUS_CHANGE_PASSWORD'                  ,0x00000004);
-define('STATUS_FLUSH_QUEUES'                     ,0x00000008);
-
-define('STATUS_DEFAULT_OUTBOUND'                 ,0x00000001);
-define('STATUS_DEFAULT_STORE'                    ,0x00000002);
-define('STATUS_PRIMARY_IDENTITY'                 ,0x00000004);
-define('STATUS_SIMPLE_STORE'                     ,0x00000008);
-define('STATUS_XP_PREFER_LAST'                   ,0x00000010);
-define('STATUS_NO_PRIMARY_IDENTITY'              ,0x00000020);
-define('STATUS_NO_DEFAULT_STORE'                 ,0x00000040);
-define('STATUS_TEMP_SECTION'                     ,0x00000080);
-define('STATUS_OWN_STORE'                        ,0x00000100);
-define('STATUS_NEED_IPM_TREE'                    ,0x00000800);
-define('STATUS_PRIMARY_STORE'                    ,0x00001000);
-define('STATUS_SECONDARY_STORE'                  ,0x00002000);
+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);
+define('STATUS_FLUSH_QUEUES', 0x00000008);
+
+define('STATUS_DEFAULT_OUTBOUND', 0x00000001);
+define('STATUS_DEFAULT_STORE', 0x00000002);
+define('STATUS_PRIMARY_IDENTITY', 0x00000004);
+define('STATUS_SIMPLE_STORE', 0x00000008);
+define('STATUS_XP_PREFER_LAST', 0x00000010);
+define('STATUS_NO_PRIMARY_IDENTITY', 0x00000020);
+define('STATUS_NO_DEFAULT_STORE', 0x00000040);
+define('STATUS_TEMP_SECTION', 0x00000080);
+define('STATUS_OWN_STORE', 0x00000100);
+define('STATUS_NEED_IPM_TREE', 0x00000800);
+define('STATUS_PRIMARY_STORE', 0x00001000);
+define('STATUS_SECONDARY_STORE', 0x00002000);
 
 
 /* ------------ */
 /* Random flags */
 
 /* Flag for deferred error */
-define('MAPI_DEFERRED_ERRORS'                    ,0x00000008);
+define('MAPI_DEFERRED_ERRORS', 0x00000008);
 
 /* Flag for creating and using Folder Associated Information Messages */
-define('MAPI_ASSOCIATED'                         ,0x00000040);
+define('MAPI_ASSOCIATED', 0x00000040);
 
 /* Flags for OpenMessageStore() */
 
-define('MDB_NO_DIALOG'                           ,0x00000001);
-define('MDB_WRITE'                               ,0x00000004);
+define('MDB_NO_DIALOG', 0x00000001);
+define('MDB_WRITE', 0x00000004);
 /****** MAPI_DEFERRED_ERRORS    ((ULONG) 0x00000008) above */
 /****** MAPI_BEST_ACCESS        ((ULONG) 0x00000010) above */
-define('MDB_TEMPORARY'                           ,0x00000020);
-define('MDB_NO_MAIL'                             ,0x00000080);
+define('MDB_TEMPORARY', 0x00000020);
+define('MDB_NO_MAIL', 0x00000080);
 
 /* Flags for OpenAddressBook */
 
-define('AB_NO_DIALOG'                            ,0x00000001);
+define('AB_NO_DIALOG', 0x00000001);
 
 /* ((ULONG) 0x00000001 is not a valid flag on ModifyRecipients. */
-define('MODRECIP_ADD'                            ,0x00000002);
-define('MODRECIP_MODIFY'                         ,0x00000004);
-define('MODRECIP_REMOVE'                         ,0x00000008);
+define('MODRECIP_ADD', 0x00000002);
+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 ------------------------------------------------------- */
 
 /* IAttach attachment methods: PR_ATTACH_METHOD values */
 
-define('NO_ATTACHMENT'                           ,0x00000000);
-define('ATTACH_BY_VALUE'                         ,0x00000001);
-define('ATTACH_BY_REFERENCE'                     ,0x00000002);
-define('ATTACH_BY_REF_RESOLVE'                   ,0x00000003);
-define('ATTACH_BY_REF_ONLY'                      ,0x00000004);
-define('ATTACH_EMBEDDED_MSG'                     ,0x00000005);
-define('ATTACH_OLE'                              ,0x00000006);
+define('NO_ATTACHMENT', 0x00000000);
+define('ATTACH_BY_VALUE', 0x00000001);
+define('ATTACH_BY_REFERENCE', 0x00000002);
+define('ATTACH_BY_REF_RESOLVE', 0x00000003);
+define('ATTACH_BY_REF_ONLY', 0x00000004);
+define('ATTACH_EMBEDDED_MSG', 0x00000005);
+define('ATTACH_OLE', 0x00000006);
 
 /* OpenProperty  - ulFlags */
-define('MAPI_MODIFY'                             ,0x00000001);
-define('MAPI_CREATE'                             ,0x00000002);
-define('STREAM_APPEND'                           ,0x00000004);
+define('MAPI_MODIFY', 0x00000001);
+define('MAPI_CREATE', 0x00000002);
+define('STREAM_APPEND', 0x00000004);
 /****** MAPI_DEFERRED_ERRORS    ((ULONG) 0x00000008) below */
 
 
 /* PR_PRIORITY values */
-define('PRIO_URGENT'                             , 1);
-define('PRIO_NORMAL'                             , 0);
-define('PRIO_NONURGENT'                          ,-1);
+define('PRIO_URGENT', 1);
+define('PRIO_NORMAL', 0);
+define('PRIO_NONURGENT', -1);
 
 /* PR_SENSITIVITY values */
-define('SENSITIVITY_NONE'                        ,0x00000000);
-define('SENSITIVITY_PERSONAL'                    ,0x00000001);
-define('SENSITIVITY_PRIVATE'                     ,0x00000002);
-define('SENSITIVITY_COMPANY_CONFIDENTIAL'        ,0x00000003);
+define('SENSITIVITY_NONE', 0x00000000);
+define('SENSITIVITY_PERSONAL', 0x00000001);
+define('SENSITIVITY_PRIVATE', 0x00000002);
+define('SENSITIVITY_COMPANY_CONFIDENTIAL', 0x00000003);
 
 /* PR_IMPORTANCE values */
-define('IMPORTANCE_LOW'                          ,0);
-define('IMPORTANCE_NORMAL'                       ,1);
-define('IMPORTANCE_HIGH'                         ,2);
+define('IMPORTANCE_LOW', 0);
+define('IMPORTANCE_NORMAL', 1);
+define('IMPORTANCE_HIGH', 2);
 
 /* Stream interface values */
-define('STREAM_SEEK_SET'                         ,0);
-define('STREAM_SEEK_CUR'                         ,1);
-define('STREAM_SEEK_END'                         ,2);
+define('STREAM_SEEK_SET', 0);
+define('STREAM_SEEK_CUR', 1);
+define('STREAM_SEEK_END', 2);
 
-define('SHOW_SOFT_DELETES'                       ,0x00000002);
-define('DELETE_HARD_DELETE'                      ,0x00000010);
+define('SHOW_SOFT_DELETES', 0x00000002);
+define('DELETE_HARD_DELETE', 0x00000010);
 
 /*
  *    The following flags are used to indicate to the client what access
@@ -306,78 +306,78 @@ 
  *    message and folder objects as well as in contents and associated
  *    contents tables
  */
-define('MAPI_ACCESS_MODIFY'                      ,0x00000001);
-define('MAPI_ACCESS_READ'                        ,0x00000002);
-define('MAPI_ACCESS_DELETE'                      ,0x00000004);
-define('MAPI_ACCESS_CREATE_HIERARCHY'            ,0x00000008);
-define('MAPI_ACCESS_CREATE_CONTENTS'             ,0x00000010);
-define('MAPI_ACCESS_CREATE_ASSOCIATED'           ,0x00000020);
+define('MAPI_ACCESS_MODIFY', 0x00000001);
+define('MAPI_ACCESS_READ', 0x00000002);
+define('MAPI_ACCESS_DELETE', 0x00000004);
+define('MAPI_ACCESS_CREATE_HIERARCHY', 0x00000008);
+define('MAPI_ACCESS_CREATE_CONTENTS', 0x00000010);
+define('MAPI_ACCESS_CREATE_ASSOCIATED', 0x00000020);
 
-define('MAPI_SEND_NO_RICH_INFO'                  ,0x00010000);
+define('MAPI_SEND_NO_RICH_INFO', 0x00010000);
 
 /* flags for PR_STORE_SUPPORT_MASK */
-define('STORE_ANSI_OK'                           ,0x00020000); // The message store supports properties containing ANSI (8-bit) characters.
-define('STORE_ATTACH_OK'                         ,0x00000020); // The message store supports attachments (OLE or non-OLE) to messages.
-define('STORE_CATEGORIZE_OK'                     ,0x00000400); // The message store supports categorized views of tables.
-define('STORE_CREATE_OK'                         ,0x00000010); // The message store supports creation of new messages.
-define('STORE_ENTRYID_UNIQUE'                    ,0x00000001); // Entry identifiers for the objects in the message store are unique, that is, never reused during the life of the store.
-define('STORE_HTML_OK'                           ,0x00010000); // The message store supports Hypertext Markup Language (HTML) messages, stored in the PR_BODY_HTML property. Note that STORE_HTML_OK is not defined in versions of MAPIDEFS.H included with Microsoft� Exchange 2000 Server and earlier. If your development environment uses a MAPIDEFS.H file that does not include STORE_HTML_OK, use the value 0x00010000 instead.
-define('STORE_LOCALSTORE'                        ,0x00080000); // This flag is reserved and should not be used.
-define('STORE_MODIFY_OK'                         ,0x00000008); // The message store supports modification of its existing messages.
-define('STORE_MV_PROPS_OK'                       ,0x00000200); // The message store supports multivalued properties, guarantees the stability of value order in a multivalued property throughout a save operation, and supports instantiation of multivalued properties in tables.
-define('STORE_NOTIFY_OK'                         ,0x00000100); // The message store supports notifications.
-define('STORE_OLE_OK'                            ,0x00000040); // The message store supports OLE attachments. The OLE data is accessible through an IStorage interface, such as that available through the PR_ATTACH_DATA_OBJ property.
-define('STORE_PUBLIC_FOLDERS'                    ,0x00004000); // The folders in this store are public (multi-user), not private (possibly multi-instance but not multi-user).
-define('STORE_READONLY'                          ,0x00000002); // All interfaces for the message store have a read-only access level.
-define('STORE_RESTRICTION_OK'                    ,0x00001000); // The message store supports restrictions.
-define('STORE_RTF_OK'                            ,0x00000800); // The message store supports Rich Text Format (RTF) messages, usually stored compressed, and the store itself keeps PR_BODY and PR_RTF_COMPRESSED synchronized.
-define('STORE_SEARCH_OK'                         ,0x00000004); // The message store supports search-results folders.
-define('STORE_SORT_OK'                           ,0x00002000); // The message store supports sorting views of tables.
-define('STORE_SUBMIT_OK'                         ,0x00000080); // The message store supports marking a message for submission.
-define('STORE_UNCOMPRESSED_RTF'                  ,0x00008000); // The message store supports storage of Rich Text Format (RTF) messages in uncompressed form. An uncompressed RTF stream is identified by the value dwMagicUncompressedRTF in the stream header. The dwMagicUncompressedRTF value is defined in the RTFLIB.H file.
-define('STORE_UNICODE_OK'                        ,0x00040000); // The message store supports properties containing Unicode characters.
+define('STORE_ANSI_OK', 0x00020000); // The message store supports properties containing ANSI (8-bit) characters.
+define('STORE_ATTACH_OK', 0x00000020); // The message store supports attachments (OLE or non-OLE) to messages.
+define('STORE_CATEGORIZE_OK', 0x00000400); // The message store supports categorized views of tables.
+define('STORE_CREATE_OK', 0x00000010); // The message store supports creation of new messages.
+define('STORE_ENTRYID_UNIQUE', 0x00000001); // Entry identifiers for the objects in the message store are unique, that is, never reused during the life of the store.
+define('STORE_HTML_OK', 0x00010000); // The message store supports Hypertext Markup Language (HTML) messages, stored in the PR_BODY_HTML property. Note that STORE_HTML_OK is not defined in versions of MAPIDEFS.H included with Microsoft� Exchange 2000 Server and earlier. If your development environment uses a MAPIDEFS.H file that does not include STORE_HTML_OK, use the value 0x00010000 instead.
+define('STORE_LOCALSTORE', 0x00080000); // This flag is reserved and should not be used.
+define('STORE_MODIFY_OK', 0x00000008); // The message store supports modification of its existing messages.
+define('STORE_MV_PROPS_OK', 0x00000200); // The message store supports multivalued properties, guarantees the stability of value order in a multivalued property throughout a save operation, and supports instantiation of multivalued properties in tables.
+define('STORE_NOTIFY_OK', 0x00000100); // The message store supports notifications.
+define('STORE_OLE_OK', 0x00000040); // The message store supports OLE attachments. The OLE data is accessible through an IStorage interface, such as that available through the PR_ATTACH_DATA_OBJ property.
+define('STORE_PUBLIC_FOLDERS', 0x00004000); // The folders in this store are public (multi-user), not private (possibly multi-instance but not multi-user).
+define('STORE_READONLY', 0x00000002); // All interfaces for the message store have a read-only access level.
+define('STORE_RESTRICTION_OK', 0x00001000); // The message store supports restrictions.
+define('STORE_RTF_OK', 0x00000800); // The message store supports Rich Text Format (RTF) messages, usually stored compressed, and the store itself keeps PR_BODY and PR_RTF_COMPRESSED synchronized.
+define('STORE_SEARCH_OK', 0x00000004); // The message store supports search-results folders.
+define('STORE_SORT_OK', 0x00002000); // The message store supports sorting views of tables.
+define('STORE_SUBMIT_OK', 0x00000080); // The message store supports marking a message for submission.
+define('STORE_UNCOMPRESSED_RTF', 0x00008000); // The message store supports storage of Rich Text Format (RTF) messages in uncompressed form. An uncompressed RTF stream is identified by the value dwMagicUncompressedRTF in the stream header. The dwMagicUncompressedRTF value is defined in the RTFLIB.H file.
+define('STORE_UNICODE_OK', 0x00040000); // The message store supports properties containing Unicode characters.
 
 
 /*  PR_DISPLAY_TYPEs                 */
 /*  For address book contents tables */
-define('DT_MAILUSER'                             ,0x00000000);
-define('DT_DISTLIST'                             ,0x00000001);
-define('DT_FORUM'                                ,0x00000002);
-define('DT_AGENT'                                ,0x00000003);
-define('DT_ORGANIZATION'                         ,0x00000004);
-define('DT_PRIVATE_DISTLIST'                     ,0x00000005);
-define('DT_REMOTE_MAILUSER'                      ,0x00000006);
+define('DT_MAILUSER', 0x00000000);
+define('DT_DISTLIST', 0x00000001);
+define('DT_FORUM', 0x00000002);
+define('DT_AGENT', 0x00000003);
+define('DT_ORGANIZATION', 0x00000004);
+define('DT_PRIVATE_DISTLIST', 0x00000005);
+define('DT_REMOTE_MAILUSER', 0x00000006);
 
 /* For address book hierarchy tables */
-define('DT_MODIFIABLE'                           ,0x00010000);
-define('DT_GLOBAL'                               ,0x00020000);
-define('DT_LOCAL'                                ,0x00030000);
-define('DT_WAN'                                  ,0x00040000);
-define('DT_NOT_SPECIFIC'                         ,0x00050000);
+define('DT_MODIFIABLE', 0x00010000);
+define('DT_GLOBAL', 0x00020000);
+define('DT_LOCAL', 0x00030000);
+define('DT_WAN', 0x00040000);
+define('DT_NOT_SPECIFIC', 0x00050000);
 
 /* For folder hierarchy tables */
-define('DT_FOLDER'                               ,0x01000000);
-define('DT_FOLDER_LINK'                          ,0x02000000);
-define('DT_FOLDER_SPECIAL'                       ,0x04000000);
+define('DT_FOLDER', 0x01000000);
+define('DT_FOLDER_LINK', 0x02000000);
+define('DT_FOLDER_SPECIAL', 0x04000000);
 
 /* PR_DISPLAY_TYPE_EX values */
-define('DT_ROOM'                                 ,0x00000007);
-define('DT_EQUIPMENT'                            ,0x00000008);
-define('DT_SEC_DISTLIST'                         ,0x00000009);
+define('DT_ROOM', 0x00000007);
+define('DT_EQUIPMENT', 0x00000008);
+define('DT_SEC_DISTLIST', 0x00000009);
 
 /* PR_DISPLAY_TYPE_EX flags */
-define('DTE_FLAG_REMOTE_VALID'                   ,0x80000000);
-define('DTE_FLAG_ACL_CAPABLE'                    ,0x40000000); /* on for DT_MAILUSER and DT_SEC_DISTLIST */
-define('DTE_MASK_REMOTE'                         ,0x0000FF00);
-define('DTE_MASK_LOCAL'                          ,0x000000FF);
+define('DTE_FLAG_REMOTE_VALID', 0x80000000);
+define('DTE_FLAG_ACL_CAPABLE', 0x40000000); /* on for DT_MAILUSER and DT_SEC_DISTLIST */
+define('DTE_MASK_REMOTE', 0x0000FF00);
+define('DTE_MASK_LOCAL', 0x000000FF);
 
 /* OlResponseStatus */
-define('olResponseNone'                          ,0);
-define('olResponseOrganized'                     ,1);
-define('olResponseTentative'                     ,2);
-define('olResponseAccepted'                      ,3);
-define('olResponseDeclined'                      ,4);
-define('olResponseNotResponded'                  ,5);
+define('olResponseNone', 0);
+define('olResponseOrganized', 1);
+define('olResponseTentative', 2);
+define('olResponseAccepted', 3);
+define('olResponseDeclined', 4);
+define('olResponseNotResponded', 5);
 
 /* OlRecipientTrackStatus to set PR_RECIPIENT_TRACKSTATUS in recipient table
  * Value of the recipient trackstatus are same as OlResponseStatus but
@@ -385,282 +385,282 @@ 
  * and olResponseNone has different interpretation with PR_RECIPIENT_TRACKSTATUS
  * so to avoid confusions we have defined new constants.
 */
-define('olRecipientTrackStatusNone'              ,0);
-define('olRecipientTrackStatusTentative'         ,2);
-define('olRecipientTrackStatusAccepted'          ,3);
-define('olRecipientTrackStatusDeclined'          ,4);
+define('olRecipientTrackStatusNone', 0);
+define('olRecipientTrackStatusTentative', 2);
+define('olRecipientTrackStatusAccepted', 3);
+define('olRecipientTrackStatusDeclined', 4);
 
 /* OlMeetingStatus */
-define('olNonMeeting'                            ,0);
-define('olMeeting'                               ,1);
-define('olMeetingReceived'                       ,3);
-define('olMeetingCanceled'                       ,5);
-define('olMeetingReceivedAndCanceled'            ,7);
+define('olNonMeeting', 0);
+define('olMeeting', 1);
+define('olMeetingReceived', 3);
+define('olMeetingCanceled', 5);
+define('olMeetingReceivedAndCanceled', 7);
 
 /*    OlMeetingResponse */
-define('olMeetingTentative'                      ,2);
-define('olMeetingAccepted'                       ,3);
-define('olMeetingDeclined'                       ,4);
+define('olMeetingTentative', 2);
+define('olMeetingAccepted', 3);
+define('olMeetingDeclined', 4);
 
 /* OL Attendee type */
-define('olAttendeeRequired'                      ,1);
-define('olAttendeeOptional'                      ,2);
-define('olAttendeeResource'                      ,3);
+define('olAttendeeRequired', 1);
+define('olAttendeeOptional', 2);
+define('olAttendeeResource', 3);
 
 /* task status */
-define('olTaskNotStarted'                        ,0);
-define('olTaskInProgress'                        ,1);
-define('olTaskComplete'                          ,2);
-define('olTaskWaiting'                           ,3);
-define('olTaskDeferred'                          ,4);
+define('olTaskNotStarted', 0);
+define('olTaskInProgress', 1);
+define('olTaskComplete', 2);
+define('olTaskWaiting', 3);
+define('olTaskDeferred', 4);
 
 /* restrictions */
-define('RES_AND'                                 ,0);
-define('RES_OR'                                  ,1);
-define('RES_NOT'                                 ,2);
-define('RES_CONTENT'                             ,3);
-define('RES_PROPERTY'                            ,4);
-define('RES_COMPAREPROPS'                        ,5);
-define('RES_BITMASK'                             ,6);
-define('RES_SIZE'                                ,7);
-define('RES_EXIST'                               ,8);
-define('RES_SUBRESTRICTION'                      ,9);
-define('RES_COMMENT'                             ,10);
+define('RES_AND', 0);
+define('RES_OR', 1);
+define('RES_NOT', 2);
+define('RES_CONTENT', 3);
+define('RES_PROPERTY', 4);
+define('RES_COMPAREPROPS', 5);
+define('RES_BITMASK', 6);
+define('RES_SIZE', 7);
+define('RES_EXIST', 8);
+define('RES_SUBRESTRICTION', 9);
+define('RES_COMMENT', 10);
 
 /* restriction compares */
-define('RELOP_LT'                                ,0);
-define('RELOP_LE'                                ,1);
-define('RELOP_GT'                                ,2);
-define('RELOP_GE'                                ,3);
-define('RELOP_EQ'                                ,4);
-define('RELOP_NE'                                ,5);
-define('RELOP_RE'                                ,6);
+define('RELOP_LT', 0);
+define('RELOP_LE', 1);
+define('RELOP_GT', 2);
+define('RELOP_GE', 3);
+define('RELOP_EQ', 4);
+define('RELOP_NE', 5);
+define('RELOP_RE', 6);
 
 /* string 'fuzzylevel' */
-define('FL_FULLSTRING'                           ,0x00000000);
-define('FL_SUBSTRING'                            ,0x00000001);
-define('FL_PREFIX'                               ,0x00000002);
-define('FL_IGNORECASE'                           ,0x00010000);
-define('FL_IGNORENONSPACE'                       ,0x00020000);
-define('FL_LOOSE'                                ,0x00040000);
+define('FL_FULLSTRING', 0x00000000);
+define('FL_SUBSTRING', 0x00000001);
+define('FL_PREFIX', 0x00000002);
+define('FL_IGNORECASE', 0x00010000);
+define('FL_IGNORENONSPACE', 0x00020000);
+define('FL_LOOSE', 0x00040000);
 
 /* bitmask restriction types */
-define('BMR_EQZ'                                 ,0x00000000);
-define('BMR_NEZ'                                 ,0x00000001);
+define('BMR_EQZ', 0x00000000);
+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}"));
+define('pbGlobalProfileSectionGuid', makeGuid("{C8B0DB13-05AA-1A10-9BB0-00AA002FC45A}"));
 
 /* Zarafa Contacts provider GUID */
-define('ZARAFA_CONTACTS_GUID'                    ,makeGuid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
+define('ZARAFA_CONTACTS_GUID', makeGuid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
 
 /* Permissions */
 
 // Get permission type
-define('ACCESS_TYPE_DENIED'                      ,1);
-define('ACCESS_TYPE_GRANT'                       ,2);
-define('ACCESS_TYPE_BOTH'                        ,3);
-
-define('ecRightsNone'                            ,0x00000000);
-define('ecRightsReadAny'                         ,0x00000001);
-define('ecRightsCreate'                          ,0x00000002);
-define('ecRightsEditOwned'                       ,0x00000008);
-define('ecRightsDeleteOwned'                     ,0x00000010);
-define('ecRightsEditAny'                         ,0x00000020);
-define('ecRightsDeleteAny'                       ,0x00000040);
-define('ecRightsCreateSubfolder'                 ,0x00000080);
-define('ecRightsFolderAccess'                    ,0x00000100);
+define('ACCESS_TYPE_DENIED', 1);
+define('ACCESS_TYPE_GRANT', 2);
+define('ACCESS_TYPE_BOTH', 3);
+
+define('ecRightsNone', 0x00000000);
+define('ecRightsReadAny', 0x00000001);
+define('ecRightsCreate', 0x00000002);
+define('ecRightsEditOwned', 0x00000008);
+define('ecRightsDeleteOwned', 0x00000010);
+define('ecRightsEditAny', 0x00000020);
+define('ecRightsDeleteAny', 0x00000040);
+define('ecRightsCreateSubfolder', 0x00000080);
+define('ecRightsFolderAccess', 0x00000100);
 //define('ecrightsContact'                       ,0x00000200);
-define('ecRightsFolderVisible'                   ,0x00000400);
+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('ecRightsAdmin'                           ,0x00001000);
-define('ecRightsAllMask'                         ,0x000015FB);
+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);
 
 // Right change indication
-define('RIGHT_NORMAL'                            ,0x00);
-define('RIGHT_NEW'                               ,0x01);
-define('RIGHT_MODIFY'                            ,0x02);
-define('RIGHT_DELETED'                           ,0x04);
-define('RIGHT_AUTOUPDATE_DENIED'                 ,0x08);
+define('RIGHT_NORMAL', 0x00);
+define('RIGHT_NEW', 0x01);
+define('RIGHT_MODIFY', 0x02);
+define('RIGHT_DELETED', 0x04);
+define('RIGHT_AUTOUPDATE_DENIED', 0x08);
 
 // IExchangeModifyTable: defines for rules
-define('ROWLIST_REPLACE'                         ,0x0001);
-define('ROW_ADD'                                 ,0x0001);
-define('ROW_MODIFY'                              ,0x0002);
-define('ROW_REMOVE'                              ,0x0004);
-define('ROW_EMPTY'                               ,(ROW_ADD|ROW_REMOVE));
+define('ROWLIST_REPLACE', 0x0001);
+define('ROW_ADD', 0x0001);
+define('ROW_MODIFY', 0x0002);
+define('ROW_REMOVE', 0x0004);
+define('ROW_EMPTY', (ROW_ADD|ROW_REMOVE));
 
 // new property types
-define('PT_SRESTRICTION'                         ,0x00FD);
-define('PT_ACTIONS'                              ,0x00FE);
+define('PT_SRESTRICTION', 0x00FD);
+define('PT_ACTIONS', 0x00FE);
 // unused, I believe
-define('PT_FILE_HANDLE'                          ,0x0103);
-define('PT_FILE_EA'                              ,0x0104);
-define('PT_VIRTUAL'                              ,0x0105);
+define('PT_FILE_HANDLE', 0x0103);
+define('PT_FILE_EA', 0x0104);
+define('PT_VIRTUAL', 0x0105);
 
 // rules state
-define('ST_DISABLED'                             ,0x0000);
-define('ST_ENABLED'                              ,0x0001);
-define('ST_ERROR'                                ,0x0002);
-define('ST_ONLY_WHEN_OOF'                        ,0x0004);
-define('ST_KEEP_OOF_HIST'                        ,0x0008);
-define('ST_EXIT_LEVEL'                           ,0x0010);
-define('ST_SKIP_IF_SCL_IS_SAFE'                  ,0x0020);
-define('ST_RULE_PARSE_ERROR'                     ,0x0040);
-define('ST_CLEAR_OOF_HIST'                       ,0x80000000);
+define('ST_DISABLED', 0x0000);
+define('ST_ENABLED', 0x0001);
+define('ST_ERROR', 0x0002);
+define('ST_ONLY_WHEN_OOF', 0x0004);
+define('ST_KEEP_OOF_HIST', 0x0008);
+define('ST_EXIT_LEVEL', 0x0010);
+define('ST_SKIP_IF_SCL_IS_SAFE', 0x0020);
+define('ST_RULE_PARSE_ERROR', 0x0040);
+define('ST_CLEAR_OOF_HIST', 0x80000000);
 
 // action types
-define('OP_MOVE'                                 ,1);
-define('OP_COPY'                                 ,2);
-define('OP_REPLY'                                ,3);
-define('OP_OOF_REPLY'                            ,4);
-define('OP_DEFER_ACTION'                         ,5);
-define('OP_BOUNCE'                               ,6);
-define('OP_FORWARD'                              ,7);
-define('OP_DELEGATE'                             ,8);
-define('OP_TAG'                                  ,9);
-define('OP_DELETE'                               ,10);
-define('OP_MARK_AS_READ'                         ,11);
+define('OP_MOVE', 1);
+define('OP_COPY', 2);
+define('OP_REPLY', 3);
+define('OP_OOF_REPLY', 4);
+define('OP_DEFER_ACTION', 5);
+define('OP_BOUNCE', 6);
+define('OP_FORWARD', 7);
+define('OP_DELEGATE', 8);
+define('OP_TAG', 9);
+define('OP_DELETE', 10);
+define('OP_MARK_AS_READ', 11);
 
 // for OP_REPLY
-define('DO_NOT_SEND_TO_ORIGINATOR'               ,1);
-define('STOCK_REPLY_TEMPLATE'                    ,2);
+define('DO_NOT_SEND_TO_ORIGINATOR', 1);
+define('STOCK_REPLY_TEMPLATE', 2);
 
 // for OP_FORWARD
-define('FWD_PRESERVE_SENDER'                     ,1);
-define('FWD_DO_NOT_MUNGE_MSG'                    ,2);
-define('FWD_AS_ATTACHMENT'                       ,4);
+define('FWD_PRESERVE_SENDER', 1);
+define('FWD_DO_NOT_MUNGE_MSG', 2);
+define('FWD_AS_ATTACHMENT', 4);
 
 // scBounceCodevalues
-define('BOUNCE_MESSAGE_SIZE_TOO_LARGE'           ,13);
-define('BOUNCE_FORMS_MISMATCH'                   ,31);
-define('BOUNCE_ACCESS_DENIED'                    ,38);
+define('BOUNCE_MESSAGE_SIZE_TOO_LARGE', 13);
+define('BOUNCE_FORMS_MISMATCH', 31);
+define('BOUNCE_ACCESS_DENIED', 38);
 
 // Free/busystatus
-define('fbFree'                                  ,0);
-define('fbTentative'                             ,1);
-define('fbBusy'                                  ,2);
-define('fbOutOfOffice'                           ,3);
-define('fbWorkingElsewhere'                      ,4);
-define('fbNoData'                                ,4);
+define('fbFree', 0);
+define('fbTentative', 1);
+define('fbBusy', 2);
+define('fbOutOfOffice', 3);
+define('fbWorkingElsewhere', 4);
+define('fbNoData', 4);
 
 /* ICS flags */
 
 // For Synchronize()
-define('SYNC_UNICODE'                            ,0x01);
-define('SYNC_NO_DELETIONS'                       ,0x02);
-define('SYNC_NO_SOFT_DELETIONS'                  ,0x04);
-define('SYNC_READ_STATE'                         ,0x08);
-define('SYNC_ASSOCIATED'                         ,0x10);
-define('SYNC_NORMAL'                             ,0x20);
-define('SYNC_NO_CONFLICTS'                       ,0x40);
-define('SYNC_ONLY_SPECIFIED_PROPS'               ,0x80);
-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_BEST_BODY'                          ,0x2000);
-define('SYNC_IGNORE_SPECIFIED_ON_ASSOCIATED'     ,0x4000);
-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('EMS_AB_ADDRESS_LOOKUP'                   ,0x00000001);    // Flag for resolvename to resolve only exact matches
-
-define('TBL_BATCH'                               ,0x00000002);    // Batch multiple table commands
+define('SYNC_UNICODE', 0x01);
+define('SYNC_NO_DELETIONS', 0x02);
+define('SYNC_NO_SOFT_DELETIONS', 0x04);
+define('SYNC_READ_STATE', 0x08);
+define('SYNC_ASSOCIATED', 0x10);
+define('SYNC_NORMAL', 0x20);
+define('SYNC_NO_CONFLICTS', 0x40);
+define('SYNC_ONLY_SPECIFIED_PROPS', 0x80);
+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_BEST_BODY', 0x2000);
+define('SYNC_IGNORE_SPECIFIED_ON_ASSOCIATED', 0x4000);
+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('EMS_AB_ADDRESS_LOOKUP', 0x00000001); // Flag for resolvename to resolve only exact matches
+
+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('recipReserved'                           ,0x00000200);
+define('recipSendable', 0x00000001); // sendable attendee.
+define('recipOrganizer', 0x00000002); // meeting organizer
+define('recipExceptionalResponse', 0x00000010); // attendee gave a response for the exception
+define('recipExceptionalDeleted', 0x00000020); // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
+define('recipOriginal', 0x00000100); // recipient is an original Attendee
+define('recipReserved', 0x00000200);
 
 /* Flags which indicates type of Meeting Object */
-define('mtgEmpty'                                ,0x00000000);    // Unspecified.
-define('mtgRequest'                              ,0x00000001);    // Initial meeting request.
-define('mtgFull'                                 ,0x00010000);    // Full update.
-define('mtgInfo'                                 ,0x00020000);    // Informational update.
-define('mtgOutOfDate'                            ,0x00080000);    // A newer Meeting Request object or Meeting Update object was received after this one.
-define('mtgDelegatorCopy'                        ,0x00100000);    // This is set on the delegator's copy when a delegate will handle meeting-related objects.
+define('mtgEmpty', 0x00000000); // Unspecified.
+define('mtgRequest', 0x00000001); // Initial meeting request.
+define('mtgFull', 0x00010000); // Full update.
+define('mtgInfo', 0x00020000); // Informational update.
+define('mtgOutOfDate', 0x00080000); // A newer Meeting Request object or Meeting Update object was received after this one.
+define('mtgDelegatorCopy', 0x00100000); // This is set on the delegator's copy when a delegate will handle meeting-related objects.
 
-define('MAPI_ONE_OFF_UNICODE'                    ,0x8000);        // the flag that defines whether the embedded strings are Unicode in one off entryids.
-define('MAPI_ONE_OFF_NO_RICH_INFO'               ,0x0001);        // the flag that specifies whether the recipient gets TNEF or not.
+define('MAPI_ONE_OFF_UNICODE', 0x8000); // the flag that defines whether the embedded strings are Unicode in one off entryids.
+define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001); // the flag that specifies whether the recipient gets TNEF or not.
 
 /* Mask flags for mapi_msgstore_advise */
-define('fnevCriticalError'                       ,0x00000001);
-define('fnevNewMail'                             ,0x00000002);
-define('fnevObjectCreated'                       ,0x00000004);
-define('fnevObjectDeleted'                       ,0x00000008);
-define('fnevObjectModified'                      ,0x00000010);
-define('fnevObjectMoved'                         ,0x00000020);
-define('fnevObjectCopied'                        ,0x00000040);
-define('fnevSearchComplete'                      ,0x00000080);
-define('fnevTableModified'                       ,0x00000100);
-define('fnevStatusObjectModified'                ,0x00000200);
-define('fnevReservedForMapi'                     ,0x40000000);
-define('fnevExtended'                            ,0x80000000);
+define('fnevCriticalError', 0x00000001);
+define('fnevNewMail', 0x00000002);
+define('fnevObjectCreated', 0x00000004);
+define('fnevObjectDeleted', 0x00000008);
+define('fnevObjectModified', 0x00000010);
+define('fnevObjectMoved', 0x00000020);
+define('fnevObjectCopied', 0x00000040);
+define('fnevSearchComplete', 0x00000080);
+define('fnevTableModified', 0x00000100);
+define('fnevStatusObjectModified', 0x00000200);
+define('fnevReservedForMapi', 0x40000000);
+define('fnevExtended', 0x80000000);
 
 /* PersistBlockType values PR_IPM_OL2007_ENTRYIDS / PR_ADDITIONAL_REN_ENTRYIDS_EX PersistIDs*/
-define('PERSIST_SENTINEL'                        ,0x0000); // Indicates that the PersistData structure is the last one contained in the PidTagAdditionalRenEntryIdsEx property
-define('RSF_PID_RSS_SUBSCRIPTION'                ,0x8001); // Indicates that the structure contains data for the RSS Feeds folder
-define('RSF_PID_SEND_AND_TRACK'                  ,0x8002); // Indicates that the structure contains data for the Tracked Mail Processing folder
-define('RSF_PID_TODO_SEARCH'                     ,0x8004); // Indicates that the structure contains data for the To-Do folder
-define('RSF_PID_CONV_ACTIONS'                    ,0x8006); // Indicates that the structure contains data for the Conversation Action Settings folder
-define('RSF_PID_COMBINED_ACTIONS'                ,0x8007); // This value is reserved.
-define('RSF_PID_SUGGESTED_CONTACTS'              ,0x8008); // Indicates that the structure contains data for the Suggested Contacts folder.
-define('RSF_PID_CONTACT_SEARCH'                  ,0x8009); // Indicates that the structure contains data for the Contacts Search folder.
-define('RSF_PID_BUDDYLIST_PDLS'                  ,0x800A); // Indicates that the structure contains data for the IM Contacts List folder.
-define('RSF_PID_BUDDYLIST_CONTACTS'              ,0x800B); // Indicates that the structure contains data for the Quick Contacts folder.
+define('PERSIST_SENTINEL', 0x0000); // Indicates that the PersistData structure is the last one contained in the PidTagAdditionalRenEntryIdsEx property
+define('RSF_PID_RSS_SUBSCRIPTION', 0x8001); // Indicates that the structure contains data for the RSS Feeds folder
+define('RSF_PID_SEND_AND_TRACK', 0x8002); // Indicates that the structure contains data for the Tracked Mail Processing folder
+define('RSF_PID_TODO_SEARCH', 0x8004); // Indicates that the structure contains data for the To-Do folder
+define('RSF_PID_CONV_ACTIONS', 0x8006); // Indicates that the structure contains data for the Conversation Action Settings folder
+define('RSF_PID_COMBINED_ACTIONS', 0x8007); // This value is reserved.
+define('RSF_PID_SUGGESTED_CONTACTS', 0x8008); // Indicates that the structure contains data for the Suggested Contacts folder.
+define('RSF_PID_CONTACT_SEARCH', 0x8009); // Indicates that the structure contains data for the Contacts Search folder.
+define('RSF_PID_BUDDYLIST_PDLS', 0x800A); // Indicates that the structure contains data for the IM Contacts List folder.
+define('RSF_PID_BUDDYLIST_CONTACTS', 0x800B); // Indicates that the structure contains data for the Quick Contacts folder.
 
 /* PersistElementType Values ElementIDs for persist data of PR_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
+define('ELEMENT_SENTINEL', 0x0000); // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure.
+define('RSF_ELID_ENTRYID', 0x0001); // variable Indicates that the ElementData field contains the entry ID of the special folder
                                                            // that is of the type indicated by the value of the PersistID field of the PersistData structure.
-define('RSF_ELID_HEADER'                         ,0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
-
-define('STGM_DIRECT'                             ,0x00000000);
-define('STGM_TRANSACTED'                         ,0x00010000);
-define('STGM_SIMPLE'                             ,0x08000000);
-define('STGM_READ'                               ,0x00000000);
-define('STGM_WRITE'                              ,0x00000001);
-define('STGM_READWRITE'                          ,0x00000002);
-define('STGM_SHARE_DENY_NONE'                    ,0x00000040);
-define('STGM_SHARE_DENY_READ'                    ,0x00000030);
-define('STGM_SHARE_DENY_WRITE'                   ,0x00000020);
-define('STGM_SHARE_EXCLUSIVE'                    ,0x00000010);
-define('STGM_PRIORITY'                           ,0x00040000);
-define('STGM_DELETEONRELEASE'                    ,0x04000000);
-define('STGM_NOSCRATCH'                          ,0x00100000);
-define('STGM_CREATE'                             ,0x00001000);
-define('STGM_CONVERT'                            ,0x00020000);
-define('STGM_FAILIFTHERE'                        ,0x00000000);
-define('STGM_NOSNAPSHOT'                         ,0x00200000);
-define('STGM_DIRECT_SWMR'                        ,0x00400000);
+define('RSF_ELID_HEADER', 0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
+
+define('STGM_DIRECT', 0x00000000);
+define('STGM_TRANSACTED', 0x00010000);
+define('STGM_SIMPLE', 0x08000000);
+define('STGM_READ', 0x00000000);
+define('STGM_WRITE', 0x00000001);
+define('STGM_READWRITE', 0x00000002);
+define('STGM_SHARE_DENY_NONE', 0x00000040);
+define('STGM_SHARE_DENY_READ', 0x00000030);
+define('STGM_SHARE_DENY_WRITE', 0x00000020);
+define('STGM_SHARE_EXCLUSIVE', 0x00000010);
+define('STGM_PRIORITY', 0x00040000);
+define('STGM_DELETEONRELEASE', 0x04000000);
+define('STGM_NOSCRATCH', 0x00100000);
+define('STGM_CREATE', 0x00001000);
+define('STGM_CONVERT', 0x00020000);
+define('STGM_FAILIFTHERE', 0x00000000);
+define('STGM_NOSNAPSHOT', 0x00200000);
+define('STGM_DIRECT_SWMR', 0x00400000);

mapi/mapi.util.php

Indentation +32 added lines, -32 removed lines

@@ -193,12 +193,12 @@ 
 function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested){
     $result = array();
     $properties = getPropIdsFromStrings($store, Array( "duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e",
-                                               "startdate" =>  "PT_SYSTIME:PSETID_Appointment:0x820d",
-                                               "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236",
-                                               "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-                                               "recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216",
-                                               "timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233",
-                                               "label" => "PT_LONG:PSETID_Appointment:0x8214"
+                                                "startdate" =>  "PT_SYSTIME:PSETID_Appointment:0x820d",
+                                                "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236",
+                                                "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+                                                "recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216",
+                                                "timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233",
+                                                "label" => "PT_LONG:PSETID_Appointment:0x8214"
                                                 ));
 
     // Create a restriction that will discard rows of appointments that are definitely not in our
@@ -209,32 +209,32 @@ 
     $restriction =
         // OR
         Array(RES_OR,
-                 Array(
-                       Array(RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
-                             Array(
-                                   Array(RES_PROPERTY,
-                                         Array(RELOP => RELOP_GT,
-                                               ULPROPTAG => $properties["duedate"],
-                                               VALUE => $viewstart
-                                               )
-                                         ),
-                                   Array(RES_PROPERTY,
-                                         Array(RELOP => RELOP_LT,
-                                               ULPROPTAG => $properties["startdate"],
-                                               VALUE => $viewend
-                                               )
-                                         )
-                                   )
-                             ),
-                       // OR
-                       Array(RES_PROPERTY,
-                             Array(RELOP => RELOP_EQ,
-                                   ULPROPTAG => $properties["recurring"],
-                                   VALUE => true
-                                   )
-                             )
-                       ) // EXISTS OR
-                 );        // global OR
+                    Array(
+                        Array(RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+                                Array(
+                                    Array(RES_PROPERTY,
+                                            Array(RELOP => RELOP_GT,
+                                                ULPROPTAG => $properties["duedate"],
+                                                VALUE => $viewstart
+                                                )
+                                            ),
+                                    Array(RES_PROPERTY,
+                                            Array(RELOP => RELOP_LT,
+                                                ULPROPTAG => $properties["startdate"],
+                                                VALUE => $viewend
+                                                )
+                                            )
+                                    )
+                                ),
+                        // OR
+                        Array(RES_PROPERTY,
+                                Array(RELOP => RELOP_EQ,
+                                    ULPROPTAG => $properties["recurring"],
+                                    VALUE => true
+                                    )
+                                )
+                        ) // EXISTS OR
+                    );        // global OR
 
     // Get requested properties, plus whatever we need
     $proplist = array(PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]);

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
  */
 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));
 }
 
 /**
@@ -32,9 +32,9 @@ 
  *@param int $errcode the MAPI error code, if not given, we use mapi_last_hresult
  *@return string The defined name for the MAPI error code
  */
-function get_mapi_error_name($errcode=null)
+function get_mapi_error_name($errcode = null)
 {
-    if ($errcode === null){
+    if ($errcode === null) {
         $errcode = mapi_last_hresult();
     }
 
@@ -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 ($prefix == "MAPI_E_" || $prefix == "MAPI_W_") {
@@ -62,7 +62,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];
 }
 
 /**
@@ -82,28 +82,28 @@ 
     // caching
     $guids = array();
 
-    foreach($mapping as $name=>$val){
-        if(is_string($val)) {
+    foreach ($mapping as $name=>$val) {
+        if (is_string($val)) {
             $split = explode(":", $val);
 
-            if(count($split) != 3){ // invalid string, ignore
-                trigger_error(sprintf("Invalid property: %s \"%s\"",$name,$val), E_USER_NOTICE);
+            if (count($split) != 3) { // invalid string, ignore
+                trigger_error(sprintf("Invalid property: %s \"%s\"", $name, $val), E_USER_NOTICE);
                 continue;
             }
 
-            if(substr($split[2], 0, 2) == "0x") {
+            if (substr($split[2], 0, 2) == "0x") {
                 $id = hexdec(substr($split[2], 2));
             } else {
                 $id = $split[2];
             }
 
             // have we used this guid before?
-            if (!defined($split[1])){
-                if (!array_key_exists($split[1], $guids)){
+            if (!defined($split[1])) {
+                if (!array_key_exists($split[1], $guids)) {
                     $guids[$split[1]] = makeguid($split[1]);
                 }
                 $guid = $guids[$split[1]];
-            }else{
+            } else {
                 $guid = constant($split[1]);
             }
 
@@ -113,19 +113,19 @@ 
             $ids["guid"][$num] = $guid;
             $ids["type"][$num] = $split[0];
             $num++;
-        }else{
+        } else {
             // not a named property
             $props[$name] = $val;
         }
     }
 
-    if (empty($ids["id"])){
+    if (empty($ids["id"])) {
         return $props;
     }
 
     // get the ids
     $named = mapi_getidsfromnames($store, $ids["id"], $ids["guid"]);
-    foreach($named as $num=>$prop){
+    foreach ($named as $num=>$prop) {
         $props[$ids["name"][$num]] = mapi_prop_tag(constant($ids["type"][$num]), mapi_prop_id($prop));
     }
 
@@ -190,9 +190,9 @@ 
  * @param $rows array Array of rowdata as if they were returned directly from mapi_table_queryrows. Each recurring item is
  *                    expanded so that it seems that there are only many single appointments in the table.
  */
-function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested){
+function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested) {
     $result = array();
-    $properties = getPropIdsFromStrings($store, Array( "duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e",
+    $properties = getPropIdsFromStrings($store, Array("duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e",
                                                "startdate" =>  "PT_SYSTIME:PSETID_Appointment:0x820d",
                                                "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236",
                                                "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
@@ -210,7 +210,7 @@ 
         // OR
         Array(RES_OR,
                  Array(
-                       Array(RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+                       Array(RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
                              Array(
                                    Array(RES_PROPERTY,
                                          Array(RELOP => RELOP_GT,
@@ -234,7 +234,7 @@ 
                                    )
                              )
                        ) // EXISTS OR
-                 );        // global OR
+                 ); // global OR
 
     // Get requested properties, plus whatever we need
     $proplist = array(PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]);
@@ -244,16 +244,16 @@ 
 
     // $rows now contains all the items that MAY be in the window; a recurring item needs expansion before including in the output.
 
-    foreach($rows as $row) {
+    foreach ($rows as $row) {
         $items = array();
 
-        if(isset($row[$properties["recurring"]]) && $row[$properties["recurring"]]) {
+        if (isset($row[$properties["recurring"]]) && $row[$properties["recurring"]]) {
             // Recurring item
             $rec = new Recurrence($store, $row);
 
             // GetItems guarantees that the item overlaps the interval <$viewstart, $viewend>
             $occurrences = $rec->getItems($viewstart, $viewend);
-            foreach($occurrences as $occurrence) {
+            foreach ($occurrences as $occurrence) {
                 // The occurrence takes all properties from the main row, but overrides some properties (like start and end obviously)
                 $item = $occurrence + $row;
                 array_push($items, $item);
@@ -264,7 +264,7 @@ 
             array_push($items, $row);
         }
 
-        $result = array_merge($result,$items);
+        $result = array_merge($result, $items);
     }
 
     // All items are guaranteed to overlap the interval <$viewstart, $viewend>. Note that we may be returning a few extra

Braces +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
                     $guids[$split[1]] = makeguid($split[1]);
                 }
                 $guid = $guids[$split[1]];
-            }else{
+            } else{
                 $guid = constant($split[1]);
             }
 
@@ -113,7 +113,7 @@ 
             $ids["guid"][$num] = $guid;
             $ids["type"][$num] = $split[0];
             $num++;
-        }else{
+        } else{
             // not a named property
             $props[$name] = $val;
         }

mapi/mapicode.php

Spacing +96 added lines, -96 removed lines

@@ -15,9 +15,9 @@ 
 //
 // Success codes
 //
-define('S_OK',               0x00000000);
-define('S_FALSE',            0x00000001);
-define('SEVERITY_ERROR',     1);
+define('S_OK', 0x00000000);
+define('S_FALSE', 0x00000001);
+define('SEVERITY_ERROR', 1);
 
 /* from winerror.h */
 
@@ -26,7 +26,7 @@ 
 */
 function make_mapi_e($code)
 {
-    return (int) mapi_make_scode(1, $code);
+    return (int)mapi_make_scode(1, $code);
 }
 
 
@@ -35,7 +35,7 @@ 
 */
 function make_mapi_s($code)
 {
-    return (int) mapi_make_scode(0, $code);
+    return (int)mapi_make_scode(0, $code);
 }
 
 /* From mapicode.h */
@@ -81,128 +81,128 @@ 
  *      Code - is the facility's status code
  *
  */
-define('NOERROR'                                         ,0);
+define('NOERROR', 0);
 
 // The following codes don't use make_mapi_e because they are in the 0x000FF000 range,
 // but we cannot use the HEX value as would make most sense as that would break in 64bit PHP
 // (grommunio will return a negative value, but PHP would convert this define into a positive
 // value). Hence we declare the value exactly as we need it as integer and bypass the
 // 32bit/64bit hell.
-define('MAPI_E_CALL_FAILED'                              ,(int)-2147467259); // 0x80004005
-define('MAPI_E_NOT_ENOUGH_MEMORY'                        ,(int)-2147024882); // 0x8007000E
-define('MAPI_E_INVALID_PARAMETER'                        ,(int)-2147024809); // 0x80070057
-define('MAPI_E_INTERFACE_NOT_SUPPORTED'                  ,(int)-2147467262); // 0x80004002
-define('MAPI_E_NO_ACCESS'                                ,(int)-2147024891); // 0x80070005
-
-define('MAPI_E_NO_SUPPORT'                               ,make_mapi_e(0x102));
-define('MAPI_E_BAD_CHARWIDTH'                            ,make_mapi_e(0x103));
-define('MAPI_E_STRING_TOO_LONG'                          ,make_mapi_e(0x105));
-define('MAPI_E_UNKNOWN_FLAGS'                            ,make_mapi_e(0x106));
-define('MAPI_E_INVALID_ENTRYID'                          ,make_mapi_e(0x107));
-define('MAPI_E_INVALID_OBJECT'                           ,make_mapi_e(0x108));
-define('MAPI_E_OBJECT_CHANGED'                           ,make_mapi_e(0x109));
-define('MAPI_E_OBJECT_DELETED'                           ,make_mapi_e(0x10A));
-define('MAPI_E_BUSY'                                     ,make_mapi_e(0x10B));
-define('MAPI_E_NOT_ENOUGH_DISK'                          ,make_mapi_e(0x10D));
-define('MAPI_E_NOT_ENOUGH_RESOURCES'                     ,make_mapi_e(0x10E));
-define('MAPI_E_NOT_FOUND'                                ,make_mapi_e(0x10F));
-define('MAPI_E_VERSION'                                  ,make_mapi_e(0x110));
-define('MAPI_E_LOGON_FAILED'                             ,make_mapi_e(0x111));
-define('MAPI_E_SESSION_LIMIT'                            ,make_mapi_e(0x112));
-define('MAPI_E_USER_CANCEL'                              ,make_mapi_e(0x113));
-define('MAPI_E_UNABLE_TO_ABORT'                          ,make_mapi_e(0x114));
-define('MAPI_E_NETWORK_ERROR'                            ,make_mapi_e(0x115));
-define('MAPI_E_DISK_ERROR'                               ,make_mapi_e(0x116));
-define('MAPI_E_TOO_COMPLEX'                              ,make_mapi_e(0x117));
-define('MAPI_E_BAD_COLUMN'                               ,make_mapi_e(0x118));
-define('MAPI_E_EXTENDED_ERROR'                           ,make_mapi_e(0x119));
-define('MAPI_E_COMPUTED'                                 ,make_mapi_e(0x11A));
-define('MAPI_E_CORRUPT_DATA'                             ,make_mapi_e(0x11B));
-define('MAPI_E_UNCONFIGURED'                             ,make_mapi_e(0x11C));
-define('MAPI_E_FAILONEPROVIDER'                          ,make_mapi_e(0x11D));
-define('MAPI_E_UNKNOWN_CPID'                             ,make_mapi_e(0x11E));
-define('MAPI_E_UNKNOWN_LCID'                             ,make_mapi_e(0x11F));
+define('MAPI_E_CALL_FAILED', (int)-2147467259); // 0x80004005
+define('MAPI_E_NOT_ENOUGH_MEMORY', (int)-2147024882); // 0x8007000E
+define('MAPI_E_INVALID_PARAMETER', (int)-2147024809); // 0x80070057
+define('MAPI_E_INTERFACE_NOT_SUPPORTED', (int)-2147467262); // 0x80004002
+define('MAPI_E_NO_ACCESS', (int)-2147024891); // 0x80070005
+
+define('MAPI_E_NO_SUPPORT', make_mapi_e(0x102));
+define('MAPI_E_BAD_CHARWIDTH', make_mapi_e(0x103));
+define('MAPI_E_STRING_TOO_LONG', make_mapi_e(0x105));
+define('MAPI_E_UNKNOWN_FLAGS', make_mapi_e(0x106));
+define('MAPI_E_INVALID_ENTRYID', make_mapi_e(0x107));
+define('MAPI_E_INVALID_OBJECT', make_mapi_e(0x108));
+define('MAPI_E_OBJECT_CHANGED', make_mapi_e(0x109));
+define('MAPI_E_OBJECT_DELETED', make_mapi_e(0x10A));
+define('MAPI_E_BUSY', make_mapi_e(0x10B));
+define('MAPI_E_NOT_ENOUGH_DISK', make_mapi_e(0x10D));
+define('MAPI_E_NOT_ENOUGH_RESOURCES', make_mapi_e(0x10E));
+define('MAPI_E_NOT_FOUND', make_mapi_e(0x10F));
+define('MAPI_E_VERSION', make_mapi_e(0x110));
+define('MAPI_E_LOGON_FAILED', make_mapi_e(0x111));
+define('MAPI_E_SESSION_LIMIT', make_mapi_e(0x112));
+define('MAPI_E_USER_CANCEL', make_mapi_e(0x113));
+define('MAPI_E_UNABLE_TO_ABORT', make_mapi_e(0x114));
+define('MAPI_E_NETWORK_ERROR', make_mapi_e(0x115));
+define('MAPI_E_DISK_ERROR', make_mapi_e(0x116));
+define('MAPI_E_TOO_COMPLEX', make_mapi_e(0x117));
+define('MAPI_E_BAD_COLUMN', make_mapi_e(0x118));
+define('MAPI_E_EXTENDED_ERROR', make_mapi_e(0x119));
+define('MAPI_E_COMPUTED', make_mapi_e(0x11A));
+define('MAPI_E_CORRUPT_DATA', make_mapi_e(0x11B));
+define('MAPI_E_UNCONFIGURED', make_mapi_e(0x11C));
+define('MAPI_E_FAILONEPROVIDER', make_mapi_e(0x11D));
+define('MAPI_E_UNKNOWN_CPID', make_mapi_e(0x11E));
+define('MAPI_E_UNKNOWN_LCID', make_mapi_e(0x11F));
 
 /* Flavors of E_ACCESSDENIED, used at logon */
 
-define('MAPI_E_PASSWORD_CHANGE_REQUIRED'                 ,make_mapi_e(0x120));
-define('MAPI_E_PASSWORD_EXPIRED'                         ,make_mapi_e(0x121));
-define('MAPI_E_INVALID_WORKSTATION_ACCOUNT'              ,make_mapi_e(0x122));
-define('MAPI_E_INVALID_ACCESS_TIME'                      ,make_mapi_e(0x123));
-define('MAPI_E_ACCOUNT_DISABLED'                         ,make_mapi_e(0x124));
-define('MAPI_E_WEBAPP_FEATURE_DISABLED'                  ,make_mapi_e(0x125));
+define('MAPI_E_PASSWORD_CHANGE_REQUIRED', make_mapi_e(0x120));
+define('MAPI_E_PASSWORD_EXPIRED', make_mapi_e(0x121));
+define('MAPI_E_INVALID_WORKSTATION_ACCOUNT', make_mapi_e(0x122));
+define('MAPI_E_INVALID_ACCESS_TIME', make_mapi_e(0x123));
+define('MAPI_E_ACCOUNT_DISABLED', make_mapi_e(0x124));
+define('MAPI_E_WEBAPP_FEATURE_DISABLED', make_mapi_e(0x125));
 
 /* MAPI base function and status object specific errors and warnings */
 
-define('MAPI_E_END_OF_SESSION'                           ,make_mapi_e(0x200));
-define('MAPI_E_UNKNOWN_ENTRYID'                          ,make_mapi_e(0x201));
-define('MAPI_E_MISSING_REQUIRED_COLUMN'                  ,make_mapi_e(0x202));
-define('MAPI_W_NO_SERVICE'                               ,make_mapi_s(0x203));
+define('MAPI_E_END_OF_SESSION', make_mapi_e(0x200));
+define('MAPI_E_UNKNOWN_ENTRYID', make_mapi_e(0x201));
+define('MAPI_E_MISSING_REQUIRED_COLUMN', make_mapi_e(0x202));
+define('MAPI_W_NO_SERVICE', make_mapi_s(0x203));
 
 /* Property specific errors and warnings */
 
-define('MAPI_E_BAD_VALUE'                                ,make_mapi_e(0x301));
-define('MAPI_E_INVALID_TYPE'                             ,make_mapi_e(0x302));
-define('MAPI_E_TYPE_NO_SUPPORT'                          ,make_mapi_e(0x303));
-define('MAPI_E_UNEXPECTED_TYPE'                          ,make_mapi_e(0x304));
-define('MAPI_E_TOO_BIG'                                  ,make_mapi_e(0x305));
-define('MAPI_E_DECLINE_COPY'                             ,make_mapi_e(0x306));
-define('MAPI_E_UNEXPECTED_ID'                            ,make_mapi_e(0x307));
+define('MAPI_E_BAD_VALUE', make_mapi_e(0x301));
+define('MAPI_E_INVALID_TYPE', make_mapi_e(0x302));
+define('MAPI_E_TYPE_NO_SUPPORT', make_mapi_e(0x303));
+define('MAPI_E_UNEXPECTED_TYPE', make_mapi_e(0x304));
+define('MAPI_E_TOO_BIG', make_mapi_e(0x305));
+define('MAPI_E_DECLINE_COPY', make_mapi_e(0x306));
+define('MAPI_E_UNEXPECTED_ID', make_mapi_e(0x307));
 
-define('MAPI_W_ERRORS_RETURNED'                          ,make_mapi_s(0x380));
+define('MAPI_W_ERRORS_RETURNED', make_mapi_s(0x380));
 
 /* Table specific errors and warnings */
 
-define('MAPI_E_UNABLE_TO_COMPLETE'                       ,make_mapi_e(0x400));
-define('MAPI_E_TIMEOUT'                                  ,make_mapi_e(0x401));
-define('MAPI_E_TABLE_EMPTY'                              ,make_mapi_e(0x402));
-define('MAPI_E_TABLE_TOO_BIG'                            ,make_mapi_e(0x403));
+define('MAPI_E_UNABLE_TO_COMPLETE', make_mapi_e(0x400));
+define('MAPI_E_TIMEOUT', make_mapi_e(0x401));
+define('MAPI_E_TABLE_EMPTY', make_mapi_e(0x402));
+define('MAPI_E_TABLE_TOO_BIG', make_mapi_e(0x403));
 
-define('MAPI_E_INVALID_BOOKMARK'                         ,make_mapi_e(0x405));
+define('MAPI_E_INVALID_BOOKMARK', make_mapi_e(0x405));
 
-define('MAPI_W_POSITION_CHANGED'                         ,make_mapi_s(0x481));
-define('MAPI_W_APPROX_COUNT'                             ,make_mapi_s(0x482));
+define('MAPI_W_POSITION_CHANGED', make_mapi_s(0x481));
+define('MAPI_W_APPROX_COUNT', make_mapi_s(0x482));
 
 /* Transport specific errors and warnings */
 
-define('MAPI_E_WAIT'                                     ,make_mapi_e(0x500));
-define('MAPI_E_CANCEL'                                   ,make_mapi_e(0x501));
-define('MAPI_E_NOT_ME'                                   ,make_mapi_e(0x502));
+define('MAPI_E_WAIT', make_mapi_e(0x500));
+define('MAPI_E_CANCEL', make_mapi_e(0x501));
+define('MAPI_E_NOT_ME', make_mapi_e(0x502));
 
-define('MAPI_W_CANCEL_MESSAGE'                           ,make_mapi_s(0x580));
+define('MAPI_W_CANCEL_MESSAGE', make_mapi_s(0x580));
 
 /* Message Store, Folder, and Message specific errors and warnings */
 
-define('MAPI_E_CORRUPT_STORE'                            ,make_mapi_e(0x600));
-define('MAPI_E_NOT_IN_QUEUE'                             ,make_mapi_e(0x601));
-define('MAPI_E_NO_SUPPRESS'                              ,make_mapi_e(0x602));
-define('MAPI_E_COLLISION'                                ,make_mapi_e(0x604));
-define('MAPI_E_NOT_INITIALIZED'                          ,make_mapi_e(0x605));
-define('MAPI_E_NON_STANDARD'                             ,make_mapi_e(0x606));
-define('MAPI_E_NO_RECIPIENTS'                            ,make_mapi_e(0x607));
-define('MAPI_E_SUBMITTED'                                ,make_mapi_e(0x608));
-define('MAPI_E_HAS_FOLDERS'                              ,make_mapi_e(0x609));
-define('MAPI_E_HAS_MESSAGES'                             ,make_mapi_e(0x60A));
-define('MAPI_E_FOLDER_CYCLE'                             ,make_mapi_e(0x60B));
-define('MAPI_E_STORE_FULL'                               ,make_mapi_e(0x60C));
-
-define('MAPI_W_PARTIAL_COMPLETION'                       ,make_mapi_s(0x680));
+define('MAPI_E_CORRUPT_STORE', make_mapi_e(0x600));
+define('MAPI_E_NOT_IN_QUEUE', make_mapi_e(0x601));
+define('MAPI_E_NO_SUPPRESS', make_mapi_e(0x602));
+define('MAPI_E_COLLISION', make_mapi_e(0x604));
+define('MAPI_E_NOT_INITIALIZED', make_mapi_e(0x605));
+define('MAPI_E_NON_STANDARD', make_mapi_e(0x606));
+define('MAPI_E_NO_RECIPIENTS', make_mapi_e(0x607));
+define('MAPI_E_SUBMITTED', make_mapi_e(0x608));
+define('MAPI_E_HAS_FOLDERS', make_mapi_e(0x609));
+define('MAPI_E_HAS_MESSAGES', make_mapi_e(0x60A));
+define('MAPI_E_FOLDER_CYCLE', make_mapi_e(0x60B));
+define('MAPI_E_STORE_FULL', make_mapi_e(0x60C));
+
+define('MAPI_W_PARTIAL_COMPLETION', make_mapi_s(0x680));
 
 /* Address Book specific errors and warnings */
 
-define('MAPI_E_AMBIGUOUS_RECIP'                          ,make_mapi_e(0x700));
+define('MAPI_E_AMBIGUOUS_RECIP', make_mapi_e(0x700));
 
 /* ICS errors and warnings */
 
-define('SYNC_E_UNKNOWN_FLAGS',                            MAPI_E_UNKNOWN_FLAGS);
-define('SYNC_E_INVALID_PARAMETER',                        MAPI_E_INVALID_PARAMETER);
-define('SYNC_E_ERROR',                                    MAPI_E_CALL_FAILED);
-define('SYNC_E_OBJECT_DELETED',                           make_mapi_e(0x800));
-define('SYNC_E_IGNORE',                                   make_mapi_e(0x801));
-define('SYNC_E_CONFLICT',                                 make_mapi_e(0x802));
-define('SYNC_E_NO_PARENT',                                make_mapi_e(0x803));
-define('SYNC_E_INCEST',                                   make_mapi_e(0x804));
-define('SYNC_E_UNSYNCHRONIZED',                           make_mapi_e(0x805));
-
-define('SYNC_W_PROGRESS',                                 make_mapi_s(0x820));
-define('SYNC_W_CLIENT_CHANGE_NEWER',                      make_mapi_s(0x821));
+define('SYNC_E_UNKNOWN_FLAGS', MAPI_E_UNKNOWN_FLAGS);
+define('SYNC_E_INVALID_PARAMETER', MAPI_E_INVALID_PARAMETER);
+define('SYNC_E_ERROR', MAPI_E_CALL_FAILED);
+define('SYNC_E_OBJECT_DELETED', make_mapi_e(0x800));
+define('SYNC_E_IGNORE', make_mapi_e(0x801));
+define('SYNC_E_CONFLICT', make_mapi_e(0x802));
+define('SYNC_E_NO_PARENT', make_mapi_e(0x803));
+define('SYNC_E_INCEST', make_mapi_e(0x804));
+define('SYNC_E_UNSYNCHRONIZED', make_mapi_e(0x805));
+
+define('SYNC_W_PROGRESS', make_mapi_s(0x820));
+define('SYNC_W_CLIENT_CHANGE_NEWER', make_mapi_s(0x821));

mapi/class.meetingrequest.php

Indentation +3 added lines, -3 removed lines

@@ -611,7 +611,7 @@ 
      * @param string $newProposedStartTime contains starttime if user has proposed other time
      * @param string $newProposedEndTime contains endtime if user has proposed other time
      * @param string $basedate start of day of occurrence for which user has accepted the recurrent meeting
-	 * @param boolean $isImported true to indicate that MR is imported from .ics or .vcs file else it false.
+     * @param boolean $isImported true to indicate that MR is imported from .ics or .vcs file else it false.
      * @return string $entryid entryid of item which created/updated in calendar
      */
     function doAccept($tentative, $sendresponse, $move, $newProposedStartTime=false, $newProposedEndTime=false, $body=false, $userAction = false, $store=false, $basedate = false, $isImported = false)
@@ -1841,7 +1841,7 @@ 
 
     /**
      * Function will resolve the user and open its store
-	 * @param String $ownerentryid the entryid of the user
+     * @param String $ownerentryid the entryid of the user
      * @return MAPIStore store of the user
      */
     function openCustomUserStore($ownerentryid)
@@ -3752,7 +3752,7 @@ 
         }
 
         return $localCategories;
-	}
+    }
 
     /**
      * Helper function which is use to apply local categories on respective occurrences.

Spacing +258 added lines, -258 removed lines

@@ -150,15 +150,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';
@@ -167,11 +167,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';
@@ -209,12 +209,12 @@ 
      */
     function isMeetingRequest($messageClass = false)
     {
-        if($messageClass === false) {
+        if ($messageClass === false) {
             $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
             $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
         }
 
-        if($messageClass !== false &&  stripos($messageClass, 'ipm.schedule.meeting.request') === 0) {
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.request') === 0) {
             return true;
         }
 
@@ -228,12 +228,12 @@ 
      */
     function isMeetingRequestResponse($messageClass = false)
     {
-        if($messageClass === false) {
+        if ($messageClass === false) {
             $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
             $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
         }
 
-        if($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.resp') === 0) {
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.resp') === 0) {
             return true;
         }
 
@@ -247,12 +247,12 @@ 
      */
     function isMeetingCancellation($messageClass = false)
     {
-        if($messageClass === false) {
+        if ($messageClass === false) {
             $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
             $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
         }
 
-        if($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.canceled') === 0) {
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.canceled') === 0) {
             return true;
         }
 
@@ -266,7 +266,7 @@ 
     function getLastUpdateCounter()
     {
         $calendarItemProps = mapi_getprops($this->message, array($this->proptags['last_updatecounter']));
-        if(isset($calendarItemProps) && !empty($calendarItemProps)){
+        if (isset($calendarItemProps) && !empty($calendarItemProps)) {
             return $calendarItemProps[$this->proptags['last_updatecounter']];
         }
         return false;
@@ -278,10 +278,10 @@ 
      */
     function processMeetingRequestResponse()
     {
-        if(!$this->isMeetingRequestResponse())
+        if (!$this->isMeetingRequestResponse())
             return;
 
-        if(!$this->isLocalOrganiser())
+        if (!$this->isLocalOrganiser())
             return;
 
         // Get information we need from the response message
@@ -306,7 +306,7 @@ 
 
         $goid2 = $messageprops[$this->proptags['goid2']];
 
-        if(!isset($goid2) || !isset($messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS])) {
+        if (!isset($goid2) || !isset($messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS])) {
             return;
         }
 
@@ -325,7 +325,7 @@ 
         }
 
         // check for calendar access
-        if($this->checkCalendarWriteAccess($userStore) !== true) {
+        if ($this->checkCalendarWriteAccess($userStore) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // allow caller to fill the error message
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
@@ -359,7 +359,7 @@ 
         $calendarItemProps = mapi_getprops($calendarItem, array($this->proptags['recurring'], PR_STORE_ENTRYID, PR_PARENT_ENTRYID, PR_ENTRYID, $this->proptags['updatecounter']));
 
         // check if meeting response is already processed
-        if(isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+        if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
             // meeting is already processed
             return;
         } else {
@@ -369,7 +369,7 @@ 
 
         // if meeting is updated in organizer's calendar then we don't need to process
         // old response
-        if($this->isMeetingUpdated($basedate)) {
+        if ($this->isMeetingUpdated($basedate)) {
             return;
         }
 
@@ -387,11 +387,11 @@ 
                                             ));
 
             // Create/modify exception
-            if($recurr->isException($basedate)) {
+            if ($recurr->isException($basedate)) {
                 $recurr->modifyException($exception_props, $basedate);
             } else {
                 // When we are creating an exception we need copy recipients from main recurring item
-                $recipTable =  mapi_message_getrecipienttable($calendarItem);
+                $recipTable = mapi_message_getrecipienttable($calendarItem);
                 $recips = mapi_table_queryallrows($recipTable, $this->recipprops);
 
                 // Retrieve actual start/due dates from calendar item.
@@ -423,9 +423,9 @@ 
 
         $totalrecips = 0;
         $acceptedrecips = 0;
-        foreach($recipients as $recipient) {
+        foreach ($recipients as $recipient) {
             $totalrecips++;
-            if(isset($recipient[PR_ENTRYID]) && $this->compareABEntryIDs($recipient[PR_ENTRYID], $senderentryid)) {
+            if (isset($recipient[PR_ENTRYID]) && $this->compareABEntryIDs($recipient[PR_ENTRYID], $senderentryid)) {
                 $found = true;
 
                 /**
@@ -441,7 +441,7 @@ 
                 $recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $messageprops[$this->proptags['attendee_critical_change']];
 
                 // If this is a counter proposal, set the proposal properties in the recipient row
-                if(isset($messageprops[$this->proptags['counter_proposal']]) && $messageprops[$this->proptags['counter_proposal']]){
+                if (isset($messageprops[$this->proptags['counter_proposal']]) && $messageprops[$this->proptags['counter_proposal']]) {
                     $recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
                     $recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
                     $recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
@@ -449,13 +449,13 @@ 
 
                 mapi_message_modifyrecipients($calendarItem, MODRECIP_MODIFY, Array($recipient));
             }
-            if(isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted)
+            if (isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted)
                 $acceptedrecips++;
         }
 
         // If the recipient was not found in the original calendar item,
         // then add the recpient as a new optional recipient
-        if(!$found) {
+        if (!$found) {
             $recipient = Array();
             $recipient[PR_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
             $recipient[PR_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
@@ -467,7 +467,7 @@ 
             $recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $deliverytime;
 
             // If this is a counter proposal, set the proposal properties in the recipient row
-            if(isset($messageprops[$this->proptags['counter_proposal']])){
+            if (isset($messageprops[$this->proptags['counter_proposal']])) {
                 $recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
                 $recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
                 $recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
@@ -475,7 +475,7 @@ 
 
             mapi_message_modifyrecipients($calendarItem, MODRECIP_ADD, Array($recipient));
             $totalrecips++;
-            if($recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
+            if ($recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
                 $acceptedrecips++;
             }
         }
@@ -485,11 +485,11 @@ 
 If it is the first time this attendee has proposed a new date/time, increment the value of the PidLidAppointmentProposalNumber property on the organizer's meeting object, by 0x00000001. If this property did not previously exist on the organizer's meeting object, it MUST be set with a value of 0x00000001.
 */
         // If this is a counter proposal, set the counter proposal indicator boolean
-        if(isset($messageprops[$this->proptags['counter_proposal']])){
+        if (isset($messageprops[$this->proptags['counter_proposal']])) {
             $props = Array();
-            if($messageprops[$this->proptags['counter_proposal']]){
+            if ($messageprops[$this->proptags['counter_proposal']]) {
                 $props[$this->proptags['counter_proposal']] = true;
-            }else{
+            } else {
                 $props[$this->proptags['counter_proposal']] = false;
             }
 
@@ -509,15 +509,15 @@ 
      */
     function processMeetingCancellation()
     {
-        if(!$this->isMeetingCancellation()) {
+        if (!$this->isMeetingCancellation()) {
             return;
         }
 
-        if($this->isLocalOrganiser()) {
+        if ($this->isLocalOrganiser()) {
             return;
         }
 
-        if(!$this->isInCalendar()) {
+        if (!$this->isInCalendar()) {
             return;
         }
 
@@ -535,13 +535,13 @@ 
         $listProperties['rcvd_representing_search_key'] = PR_RCVD_REPRESENTING_SEARCH_KEY;
         $messageProps = mapi_getprops($this->message, $listProperties);
 
-        $goid = $messageProps[$this->proptags['goid']];    //GlobalID (0x3)
-        if(!isset($goid)) {
+        $goid = $messageProps[$this->proptags['goid']]; //GlobalID (0x3)
+        if (!isset($goid)) {
             return;
         }
 
         // get delegator store, if delegate is processing this cancellation
-        if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])){
+        if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
             $delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], array(PR_IPM_APPOINTMENT_ENTRYID));
 
             $store = $delegatorStore['store'];
@@ -552,7 +552,7 @@ 
         }
 
         // check for calendar access
-        if($this->checkCalendarWriteAccess($store) !== true) {
+        if ($this->checkCalendarWriteAccess($store) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // allow caller to fill the error message
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
@@ -561,18 +561,18 @@ 
         $calendarItem = $this->getCorrespondentCalendarItem(true);
         $basedate = $this->getBasedateFromGlobalID($goid);
 
-        if($calendarItem !== false) {
+        if ($calendarItem !== false) {
             // if basedate is provided and we could not find the item then it could be that we are processing
             // an exception so get the exception and process it
-            if($basedate) {
+            if ($basedate) {
                 $calendarItemProps = mapi_getprops($calendarItem, array($this->proptags['recurring']));
-                if ($calendarItemProps[$this->proptags['recurring']] === true){
+                if ($calendarItemProps[$this->proptags['recurring']] === true) {
                     $recurr = new Recurrence($store, $calendarItem);
 
                     // Set message class
                     $messageProps[PR_MESSAGE_CLASS] = 'IPM.Appointment';
 
-                    if($recurr->isException($basedate)) {
+                    if ($recurr->isException($basedate)) {
                         $recurr->modifyException($messageProps, $basedate);
                     } else {
                         $recurr->createException($messageProps, $basedate);
@@ -614,9 +614,9 @@ 
 	 * @param boolean $isImported true to indicate that MR is imported from .ics or .vcs file else it false.
      * @return string $entryid entryid of item which created/updated in calendar
      */
-    function doAccept($tentative, $sendresponse, $move, $newProposedStartTime=false, $newProposedEndTime=false, $body=false, $userAction = false, $store=false, $basedate = false, $isImported = false)
+    function doAccept($tentative, $sendresponse, $move, $newProposedStartTime = false, $newProposedEndTime = false, $body = false, $userAction = false, $store = false, $basedate = false, $isImported = false)
     {
-        if($this->isLocalOrganiser()) {
+        if ($this->isLocalOrganiser()) {
             return false;
         }
 
@@ -635,14 +635,14 @@ 
         }
 
         // check for calendar access
-        if($this->checkCalendarWriteAccess($store) !== true) {
+        if ($this->checkCalendarWriteAccess($store) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // allow caller to fill the error message
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
         }
 
         // if meeting is out dated then don't process it
-        if($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $this->isMeetingOutOfDate()) {
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $this->isMeetingOutOfDate()) {
             return false;
         }
 
@@ -653,8 +653,8 @@ 
                 recipient's calendar
          *    2) after this every subsequent request to open meeting request will not do any processing
          */
-        if($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction == false) {
-            if(isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction == false) {
+            if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
                 // if meeting request is already processed then don't do anything
                 return false;
             }
@@ -662,7 +662,7 @@ 
             // if correspondent calendar item is already processed then don't do anything
             $calendarItem = $this->getCorrespondentCalendarItem();
             $calendarItemProps = mapi_getprops($calendarItem, array(PR_PROCESSED));
-            if(isset($calendarItemProps[PR_PROCESSED]) && $calendarItemProps[PR_PROCESSED] == true) {
+            if (isset($calendarItemProps[PR_PROCESSED]) && $calendarItemProps[PR_PROCESSED] == true) {
                 // mark meeting-request mail as processed as well
                 mapi_setprops($this->message, Array(PR_PROCESSED => true));
                 mapi_savechanges($this->message);
@@ -678,7 +678,7 @@ 
 
         // set counter proposal properties in calendar item when proposing new time
         $proposeNewTimeProps = array();
-        if($newProposedStartTime && $newProposedEndTime) {
+        if ($newProposedStartTime && $newProposedEndTime) {
             $proposeNewTimeProps[$this->proptags['proposed_start_whole']] = $newProposedStartTime;
             $proposeNewTimeProps[$this->proptags['proposed_end_whole']] = $newProposedEndTime;
             $proposeNewTimeProps[$this->proptags['proposed_duration']] = round($newProposedEndTime - $newProposedStartTime) / 60;
@@ -688,15 +688,15 @@ 
         // While sender is receiver then we have to process the meeting request as per the intended busy status
         // instead of tentative, and accept the same as per the intended busystatus.
         $senderEntryId = isset($messageprops[PR_SENT_REPRESENTING_ENTRYID]) ? $messageprops[PR_SENT_REPRESENTING_ENTRYID] : $messageprops[PR_SENDER_ENTRYID];
-        if(isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && MAPIUtils::CompareEntryIds($senderEntryId, $messageprops[PR_RECEIVED_BY_ENTRYID])) {
+        if (isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && MAPIUtils::CompareEntryIds($senderEntryId, $messageprops[PR_RECEIVED_BY_ENTRYID])) {
             $entryid = $this->accept(false, $sendresponse, $move, $proposeNewTimeProps, $body, true, $store, $calFolder, $basedate);
         } else {
             $entryid = $this->accept($tentative, $sendresponse, $move, $proposeNewTimeProps, $body, $userAction, $store, $calFolder, $basedate);
         }
 
         // if we have first time processed this meeting then set PR_PROCESSED property
-        if($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction === false && $isImported === false) {
-            if(!isset($messageprops[PR_PROCESSED]) || $messageprops[PR_PROCESSED] != true) {
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction === false && $isImported === false) {
+            if (!isset($messageprops[PR_PROCESSED]) || $messageprops[PR_PROCESSED] != true) {
                 // set processed flag
                 mapi_setprops($this->message, Array(PR_PROCESSED => true));
                 mapi_savechanges($this->message);
@@ -736,7 +736,7 @@ 
                 // Find main recurring item based on GlobalID (0x3)
                 $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
                 if (is_array($items)) {
-                    foreach($items as $key => $entryid) {
+                    foreach ($items as $key => $entryid) {
                         $calendarItem = mapi_msgstore_openentry($store, $entryid);
                     }
                 }
@@ -747,14 +747,14 @@ 
                     $calendarItem = mapi_folder_createmessage($calFolder);
                 } else {
                     // we have found the main recurring item, check if this meeting request is already processed
-                    if(isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+                    if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
                         // only set required properties, other properties are already copied when processing this meeting request
                         // for the first time
                         $processed = true;
                     }
                 }
 
-                if(!$processed) {
+                if (!$processed) {
                     // get all the properties and copy that to calendar item
                     $props = mapi_getprops($this->message);
 
@@ -785,7 +785,7 @@ 
                 $props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
 
                 if (isset($props[$this->proptags['intendedbusystatus']])) {
-                    if($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
+                    if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
                         $props[$this->proptags['busystatus']] = fbTentative;
                     } else {
                         $props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
@@ -795,12 +795,12 @@ 
                     $props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
                 }
 
-                if($userAction) {
+                if ($userAction) {
                     $addrInfo = $this->getOwnerAddress($this->store);
 
                     // if user has responded then set replytime and name
                     $props[$this->proptags['replytime']] = time();
-                    if(!empty($addrInfo)) {
+                    if (!empty($addrInfo)) {
                         // @FIXME conditionally set this property only for delegation case
                         $props[$this->proptags['apptreplyname']] = $addrInfo[0];
                     }
@@ -809,7 +809,7 @@ 
                 mapi_setprops($calendarItem, $props);
 
                 // we have already processed attachments and recipients, so no need to do it again
-                if(!$processed) {
+                if (!$processed) {
                     // Copy attachments too
                     $this->replaceAttachments($this->message, $calendarItem);
                     // Copy recipients too
@@ -821,7 +821,7 @@ 
                 $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder, true);
                 if (is_array($items)) {
                     // Save all existing occurrence as exceptions
-                    foreach($items as $entryid) {
+                    foreach ($items as $entryid) {
                         // Open occurrence
                         $occurrenceItem = mapi_msgstore_openentry($store, $entryid);
 
@@ -867,7 +867,7 @@ 
                     // Find main recurring item from CleanGlobalID of this meeting request
                     $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
                     if (is_array($items)) {
-                        foreach($items as $key => $entryid) {
+                        foreach ($items as $key => $entryid) {
                             $calendarItem = mapi_msgstore_openentry($store, $entryid);
                         }
                     }
@@ -902,7 +902,7 @@ 
                         mapi_copyto($this->message, array(), array(), $calmsg); /* includes attachments and recipients */
 
                         // After creating new MR, If local categories exist then apply it on new MR.
-                        if(!empty($localCategories)) {
+                        if (!empty($localCategories)) {
                             mapi_setprops($calmsg, $localCategories);
                         }
 
@@ -919,7 +919,7 @@ 
                         }
 
                         if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
-                            if($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
+                            if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
                                 $calItemProps[$this->proptags['busystatus']] = fbTentative;
                             } else {
                                 $calItemProps[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
@@ -931,12 +931,12 @@ 
 
                         // when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
                         $calItemProps[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
-                        if($userAction) {
+                        if ($userAction) {
                             $addrInfo = $this->getOwnerAddress($this->store);
 
                             // if user has responded then set replytime and name
                             $calItemProps[$this->proptags['replytime']] = time();
-                            if(!empty($addrInfo)) {
+                            if (!empty($addrInfo)) {
                                 $calItemProps[$this->proptags['apptreplyname']] = $addrInfo[0];
                             }
                         }
@@ -991,7 +991,7 @@ 
                         $props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
 
                         if (isset($props[$this->proptags['intendedbusystatus']])) {
-                            if($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
+                            if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
                                 $props[$this->proptags['busystatus']] = fbTentative;
                             } else {
                                 $props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
@@ -1001,12 +1001,12 @@ 
                             $props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
                         }
 
-                        if($userAction) {
+                        if ($userAction) {
                             $addrInfo = $this->getOwnerAddress($this->store);
 
                             // if user has responded then set replytime and name
                             $props[$this->proptags['replytime']] = time();
-                            if(!empty($addrInfo)) {
+                            if (!empty($addrInfo)) {
                                 $props[$this->proptags['apptreplyname']] = $addrInfo[0];
                             }
                         }
@@ -1049,7 +1049,7 @@ 
             $props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
 
             if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
-                if($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
+                if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
                     $props[$this->proptags['busystatus']] = fbTentative;
                 } else {
                     $props[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
@@ -1065,7 +1065,7 @@ 
 
             // if user has responded then set replytime and name
             $props[$this->proptags['replytime']] = time();
-            if(!empty($addrInfo)) {
+            if (!empty($addrInfo)) {
                 $props[$this->proptags['apptreplyname']] = $addrInfo[0];
             }
 
@@ -1076,7 +1076,7 @@ 
                 $reciptable = mapi_message_getrecipienttable($this->message);
                 $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 
-                if($recurr->isException($basedate)) {
+                if ($recurr->isException($basedate)) {
                     $recurr->modifyException($proposeNewTimeProps + $props, $basedate, $recips);
                 } else {
                     $props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
@@ -1114,7 +1114,7 @@ 
      */
     function doDecline($sendresponse, $basedate = false, $body = false)
     {
-        if($this->isLocalOrganiser()) {
+        if ($this->isLocalOrganiser()) {
             return false;
         }
 
@@ -1136,7 +1136,7 @@ 
         }
 
         // check for calendar access before deleting the calendar item
-        if($this->checkCalendarWriteAccess($store) !== true) {
+        if ($this->checkCalendarWriteAccess($store) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // allow caller to fill the error message
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
@@ -1151,7 +1151,7 @@ 
             $basedate = $this->getBasedateFromGlobalID($goid);
         }
 
-        if($sendresponse) {
+        if ($sendresponse) {
             $this->createResponse(olResponseDeclined, array(), $body, $store, $basedate, $calFolder);
         }
 
@@ -1160,7 +1160,7 @@ 
             $calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
 
             if (is_array($calendaritems)) {
-                foreach($calendaritems as $entryid) {
+                foreach ($calendaritems as $entryid) {
                     // Open each calendar item and set the properties of the cancellation object
                     $calendaritem = mapi_msgstore_openentry($store, $entryid);
 
@@ -1180,7 +1180,7 @@ 
         if (!$calendaritem) {
             $calendar = $this->openDefaultCalendar($store);
 
-            if(!empty($entryids)) {
+            if (!empty($entryids)) {
                 mapi_folder_deletemessages($calendar, $entryids);
             }
 
@@ -1209,7 +1209,7 @@ 
      */
     function doRemoveFromCalendar($basedate)
     {
-        if($this->isLocalOrganiser()) {
+        if ($this->isLocalOrganiser()) {
             return false;
         }
 
@@ -1228,7 +1228,7 @@ 
         }
 
         // check for calendar access before deleting the calendar item
-        if($this->checkCalendarWriteAccess($store) !== true) {
+        if ($this->checkCalendarWriteAccess($store) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // allow caller to fill the error message
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
@@ -1245,12 +1245,12 @@ 
 
             $calendarItem = $this->getCorrespondentCalendarItem(true);
 
-            if($calendarItem !== false) {
+            if ($calendarItem !== false) {
                 // basedate is provided so open exception
-                if($basedate) {
+                if ($basedate) {
                     $exception = $this->getExceptionItem($calendarItem, $basedate);
 
-                    if($exception !== false) {
+                    if ($exception !== false) {
                         // exception found, remove it from calendar
                         $this->doRemoveExceptionFromCalendar($basedate, $calendarItem, $store);
                     }
@@ -1291,12 +1291,12 @@ 
      */
     function doCancelInvitation($basedate = false)
     {
-        if(!$this->isLocalOrganiser()) {
+        if (!$this->isLocalOrganiser()) {
             return;
         }
 
         // check write access for delegate
-        if($this->checkCalendarWriteAccess($this->store) !== true) {
+        if ($this->checkCalendarWriteAccess($this->store) !== true) {
             // Throw an exception that we don't have write permissions on calendar folder,
             // error message will be filled by module
             throw new MAPIException(null, MAPI_E_NO_ACCESS);
@@ -1304,12 +1304,12 @@ 
 
         $messageProps = mapi_getprops($this->message, array(PR_ENTRYID, $this->proptags['recurring']));
 
-        if(isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
+        if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
             // cancellation of recurring series or one occurence
             $recurrence = new Recurrence($this->store, $this->message);
 
             // if basedate is specified then we are cancelling only one occurence, so create exception for that occurence
-            if($basedate) {
+            if ($basedate) {
                 $recurrence->createException(array(), $basedate, true);
             }
 
@@ -1333,7 +1333,7 @@ 
 
         // if basedate is specified then we have already created exception of it so nothing should be done now
         // but when cancelling normal / recurring meeting request we need to remove meeting from calendar
-        if($basedate === false) {
+        if ($basedate === false) {
             // get the wastebasket folder, for delegate this will give wastebasket of delegate
             $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
 
@@ -1382,7 +1382,7 @@ 
         // Length of the random data
         $goid .= pack('V', 16);
         // Random data.
-        for ($i=0; $i<16; $i++)
+        for ($i = 0; $i < 16; $i++)
             $goid .= chr(rand(0, 255));
 
         // Create a new appointment id for this item
@@ -1394,7 +1394,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;
         }
 
@@ -1441,7 +1441,7 @@ 
                 // Then send all meeting request for all exceptions
                 $exceptions = $recurr->getAllExceptions();
                 if ($exceptions) {
-                    foreach($exceptions as $exceptionBasedate) {
+                    foreach ($exceptions as $exceptionBasedate) {
                         $attach = $recurr->getExceptionAttachment($exceptionBasedate);
 
                         if ($attach) {
@@ -1489,12 +1489,12 @@ 
             }
         }
 
-        if(isset($this->errorSetResource) && $this->errorSetResource){
+        if (isset($this->errorSetResource) && $this->errorSetResource) {
             return Array(
                 'error' => $this->errorSetResource,
                 'displayname' => $this->recipientDisplayname
             );
-        }else{
+        } else {
             return true;
         }
     }
@@ -1514,23 +1514,23 @@ 
 
         $fbDataArray = mapi_freebusysupport_loaddata($fbsupport, array($entryID));
 
-        if($fbDataArray[0] != NULL){
-            foreach($fbDataArray as $fbDataUser){
+        if ($fbDataArray[0] != NULL) {
+            foreach ($fbDataArray as $fbDataUser) {
                 $rangeuser1 = mapi_freebusydata_getpublishrange($fbDataUser);
-                if($rangeuser1 == NULL){
+                if ($rangeuser1 == NULL) {
                     return $result;
                 }
 
                 $enumblock = mapi_freebusydata_enumblocks($fbDataUser, $start, $end);
                 mapi_freebusyenumblock_reset($enumblock);
 
-                while(true){
+                while (true) {
                     $blocks = mapi_freebusyenumblock_next($enumblock, 100);
-                    if(!$blocks){
+                    if (!$blocks) {
                         break;
                     }
 
-                    foreach($blocks as $blockItem){
+                    foreach ($blocks as $blockItem) {
                         $result[] = $blockItem;
                     }
                 }
@@ -1553,7 +1553,7 @@ 
     {
         $messageprops = mapi_getprops($this->message, Array($this->proptags['last_updatecounter'], $this->proptags['goid']));
 
-        if ( !isset($messageprops[$this->proptags['goid']]) ) {
+        if (!isset($messageprops[$this->proptags['goid']])) {
             $this->setMeetingRequest($basedate);
         } else {
             $counter = $messageprops[$this->proptags['last_updatecounter']] + 1;
@@ -1572,7 +1572,7 @@ 
     {
         $props = mapi_getprops($this->message, array($this->proptags['goid'], PR_MESSAGE_CLASS));
 
-        if(!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
             // we are checking with calendar item
             $calendarItem = $this->message;
         } else {
@@ -1584,10 +1584,10 @@ 
         // even if we have received request/response for exception/occurence then also
         // we can check recurring series for organizer, no need to check with exception/occurence
 
-        if($calendarItem !== false) {
+        if ($calendarItem !== false) {
             $messageProps = mapi_getprops($calendarItem, Array($this->proptags['responsestatus']));
 
-            if(isset($messageProps[$this->proptags['responsestatus']]) && $messageProps[$this->proptags['responsestatus']] === olResponseOrganized) {
+            if (isset($messageProps[$this->proptags['responsestatus']]) && $messageProps[$this->proptags['responsestatus']] === olResponseOrganized) {
                 return true;
             }
         }
@@ -1606,7 +1606,7 @@ 
     function getTrackStatus($class)
     {
         $status = olRecipientTrackStatusNone;
-        switch($class)
+        switch ($class)
         {
             case 'IPM.Schedule.Meeting.Resp.Pos':
                 $status = olRecipientTrackStatusAccepted;
@@ -1723,7 +1723,7 @@ 
         $folder = false;
         $entryid = $this->getDefaultFolderEntryID($prop, $store);
 
-        if($entryid !== false) {
+        if ($entryid !== false) {
             $folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
         }
 
@@ -1741,7 +1741,7 @@ 
     function getBaseEntryID($prop, $store = false)
     {
         $storeprops = mapi_getprops($store ? $store : $this->store, Array($prop));
-        if(!isset($storeprops[$prop])) {
+        if (!isset($storeprops[$prop])) {
             return false;
         }
 
@@ -1759,7 +1759,7 @@ 
         $folder = false;
         $entryid = $this->getBaseEntryID($prop, $store);
 
-        if($entryid !== false) {
+        if ($entryid !== false) {
             $folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
         }
 
@@ -1776,20 +1776,20 @@ 
     {
         $accessToFolder = false;
 
-        if(!empty($entryid)) {
-            if($store === false) {
+        if (!empty($entryid)) {
+            if ($store === false) {
                 $store = $this->store;
             }
 
             try {
                 $folder = mapi_msgstore_openentry($store, $entryid);
                 $folderProps = mapi_getprops($folder, Array(PR_ACCESS));
-                if(($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) {
+                if (($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) {
                     $accessToFolder = true;
                 }
             } catch (MAPIException $e) {
                 // we don't have rights to open folder, so return false
-                if($e->getCode() == MAPI_E_NO_ACCESS) {
+                if ($e->getCode() == MAPI_E_NO_ACCESS) {
                     return $accessToFolder;
                 }
 
@@ -1808,7 +1808,7 @@ 
      */
     function checkCalendarWriteAccess($store = false)
     {
-        if($store === false) {
+        if ($store === false) {
             // If this meeting request is received by a delegate then open delegator's store.
             $messageProps = mapi_getprops($this->message, array(PR_RCVD_REPRESENTING_ENTRYID));
             if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
@@ -1822,7 +1822,7 @@ 
 
         // If the store is a public folder, the calendar folder is the PARENT_ENTRYID of the calendar item
         $provider = mapi_getprops($store, array(PR_MDB_PROVIDER));
-        if(isset($provider[PR_MDB_PROVIDER]) && $provider[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
+        if (isset($provider[PR_MDB_PROVIDER]) && $provider[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
             $entryid = mapi_getprops($this->message, array(PR_PARENT_ENTRYID));
             $entryid = $entryid[PR_PARENT_ENTRYID];
         } else {
@@ -1932,10 +1932,10 @@ 
             $isRecurring = isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']];
             $isException = isset($messageprops[$this->proptags['is_exception']]) && $messageprops[$this->proptags['is_exception']];
             if ($isRecurring || $isException) {
-                if($isRecurring) {
+                if ($isRecurring) {
                     $props[$this->proptags['recurring']] = $messageprops[$this->proptags['recurring']];
                 }
-                if($isException) {
+                if ($isException) {
                     $props[$this->proptags['is_exception']] = $messageprops[$this->proptags['is_exception']];
                 }
                 $calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
@@ -1946,12 +1946,12 @@ 
         }
 
         // we are sending a response for recurring meeting request (or exception), so set some required properties
-        if(isset($recurr) && $recurr) {
-            if(!empty($messageprops[$this->proptags['recurring_pattern']])) {
+        if (isset($recurr) && $recurr) {
+            if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
                 $props[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
             }
 
-            if(!empty($messageprops[$this->proptags['recurrence_data']])) {
+            if (!empty($messageprops[$this->proptags['recurrence_data']])) {
                 $props[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
             }
 
@@ -1970,7 +1970,7 @@ 
         $recip[PR_RECIPIENT_TYPE] = MAPI_TO;
         $recip[PR_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
 
-        switch($status) {
+        switch ($status) {
             case olResponseAccepted:
                 $classpostfix = 'Pos';
                 $subjectprefix = _('Accepted');
@@ -1990,10 +1990,10 @@ 
             $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;
-        if(isset($messageprops[PR_OWNER_APPT_ID]))
+        $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];
 
         // Set GlobalId AND CleanGlobalId, if exception then also set basedate into GlobalId(0x3).
@@ -2007,7 +2007,7 @@ 
         }
 
         //Set body message in Appointment
-        if(isset($body)) {
+        if (isset($body)) {
             $props[PR_BODY] = $this->getMeetingTimeInfo() ? $this->getMeetingTimeInfo() : $body;
         }
 
@@ -2041,7 +2041,7 @@ 
      */
     function findCalendarItems($goid, $calendar = false, $useCleanGlobalId = false)
     {
-        if($calendar === false) {
+        if ($calendar === false) {
             // Open the Calendar
             $calendar = $this->openDefaultCalendar();
         }
@@ -2061,13 +2061,13 @@ 
 
         $rows = mapi_table_queryallrows($calendarcontents, Array(PR_ENTRYID), $restrict);
 
-        if(empty($rows))
+        if (empty($rows))
             return;
 
         $calendaritems = Array();
 
         // In principle, there should only be one row, but we'll handle them all just in case
-        foreach($rows as $row) {
+        foreach ($rows as $row) {
             $calendaritems[] = $row[PR_ENTRYID];
         }
 
@@ -2079,14 +2079,14 @@ 
     function compareABEntryIDs($entryid1, $entryid2)
     {
         // If the session was not passed, just do a 'normal' compare.
-        if(!$this->session) {
+        if (!$this->session) {
             return $entryid1 == $entryid2;
         }
 
         $smtp1 = $this->getSMTPAddress($entryid1);
         $smtp2 = $this->getSMTPAddress($entryid2);
 
-        if($smtp1 == $smtp2) {
+        if ($smtp1 == $smtp2) {
             return true;
         } else {
             return false;
@@ -2096,7 +2096,7 @@ 
     // Gets the SMTP address of the passed addressbook entryid
     function getSMTPAddress($entryid)
     {
-        if(!$this->session) {
+        if (!$this->session) {
             return false;
         }
 
@@ -2104,13 +2104,13 @@ 
 
         $abitem = mapi_ab_openentry($ab, $entryid);
 
-        if(!$abitem) {
+        if (!$abitem) {
             return '';
         }
 
         $props = mapi_getprops($abitem, array(PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS));
 
-        if($props[PR_ADDRTYPE] == 'SMTP') {
+        if ($props[PR_ADDRTYPE] == 'SMTP') {
             return $props[PR_EMAIL_ADDRESS];
         }
         return $props[PR_SMTP_ADDRESS];
@@ -2128,25 +2128,25 @@ 
      */
     function getOwnerAddress($store, $fallbackToLoggedInUser = true)
     {
-        if(!$this->session)
+        if (!$this->session)
             return false;
 
         $storeProps = mapi_getprops($store, array(PR_MAILBOX_OWNER_ENTRYID, PR_USER_ENTRYID));
 
         $ownerEntryId = false;
-        if(isset($storeProps[PR_USER_ENTRYID]) && $storeProps[PR_USER_ENTRYID]) {
+        if (isset($storeProps[PR_USER_ENTRYID]) && $storeProps[PR_USER_ENTRYID]) {
             $ownerEntryId = $storeProps[PR_USER_ENTRYID];
         }
 
-        if(isset($storeProps[PR_MAILBOX_OWNER_ENTRYID]) && $storeProps[PR_MAILBOX_OWNER_ENTRYID] && !$fallbackToLoggedInUser) {
+        if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID]) && $storeProps[PR_MAILBOX_OWNER_ENTRYID] && !$fallbackToLoggedInUser) {
             $ownerEntryId = $storeProps[PR_MAILBOX_OWNER_ENTRYID];
         }
 
-        if($ownerEntryId) {
+        if ($ownerEntryId) {
             $ab = mapi_openaddressbook($this->session);
 
             $zarafaUser = mapi_ab_openentry($ab, $ownerEntryId);
-            if(!$zarafaUser)
+            if (!$zarafaUser)
                 return false;
 
             $ownerProps = mapi_getprops($zarafaUser, array(PR_ADDRTYPE, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SEARCH_KEY));
@@ -2169,14 +2169,14 @@ 
         $storestable = mapi_getmsgstorestable($this->session);
         $rows = mapi_table_queryallrows($storestable, array(PR_ENTRYID, PR_DEFAULT_STORE));
 
-        foreach($rows as $row) {
-            if(isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE]) {
+        foreach ($rows as $row) {
+            if (isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE]) {
                 $entryid = $row[PR_ENTRYID];
                 break;
             }
         }
 
-        if(!$entryid)
+        if (!$entryid)
             return false;
 
         return mapi_openmsgstore($this->session, $entryid);
@@ -2190,20 +2190,20 @@ 
      * @param array $recipients    recipients list of message.
      * @param boolean $isException true if we are processing recipient of exception
      */
-    function addOrganizer($messageProps, &$recipients, $isException = false){
+    function addOrganizer($messageProps, &$recipients, $isException = false) {
 
         $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)) {
+        foreach ($recipients as $key => $recipient) {
+            if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
                 $hasOrganizer = true;
-            } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])){
+            } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
                 // Recipients for an occurrence
-                $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+                $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
             }
         }
 
-        if (!$hasOrganizer){
+        if (!$hasOrganizer) {
             // Create organizer.
             $organizer = array();
             $organizer[PR_ENTRYID] = $messageProps[PR_SENT_REPRESENTING_ENTRYID];
@@ -2213,7 +2213,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.
@@ -2267,7 +2267,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)));
     }
 
     /**
@@ -2280,10 +2280,10 @@ 
     {
         /* remove all old attachments */
         $attachmentTable = mapi_message_getattachmenttable($copyTo);
-        if($attachmentTable) {
+        if ($attachmentTable) {
             $attachments = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME));
 
-            foreach($attachments as $attachProps){
+            foreach ($attachments as $attachProps) {
                 /* remove exceptions too? */
                 if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
                     continue;
@@ -2295,15 +2295,15 @@ 
 
         /* copy new attachments */
         $attachmentTable = mapi_message_getattachmenttable($copyFrom);
-        if($attachmentTable) {
+        if ($attachmentTable) {
             $attachments = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME));
 
-            foreach($attachments as $attachProps){
+            foreach ($attachments as $attachProps) {
                 if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
                     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, array(), array(), $attachNewResourceMsg, 0);
                 mapi_savechanges($attachNewResourceMsg);
@@ -2351,7 +2351,7 @@ 
      */
     function bookResources($message, $cancel, $prefix, $basedate = false)
     {
-        if(!$this->enableDirectBooking) {
+        if (!$this->enableDirectBooking) {
             return array();
         }
 
@@ -2388,7 +2388,7 @@ 
         // Get resource recipients
         $getResourcesRestriction = Array(RES_AND,
             Array(Array(RES_PROPERTY,
-                Array(RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+                Array(RELOP => RELOP_EQ, // Equals recipient type 3: Resource
                     ULPROPTAG => PR_RECIPIENT_TYPE,
                     VALUE => array(PR_RECIPIENT_TYPE =>MAPI_BCC)
                 )
@@ -2403,7 +2403,7 @@ 
         // Put appointment into store resource users
         $i = 0;
         $len = count($resourceRecipients);
-        while(!$this->errorSetResource && $i < $len){
+        while (!$this->errorSetResource && $i < $len) {
             $userStore = $this->openCustomUserStore($resourceRecipients[$i][PR_ENTRYID]);
 
             // Open root folder
@@ -2427,21 +2427,21 @@ 
                 $this->errorSetResource = 1; // No access
             }
 
-            if($accessToFolder) {
+            if ($accessToFolder) {
                 /**
                  * Get the LocalFreebusy message that contains the properties that
                  * are set to accept or decline resource meeting requests
                  */
                 // Use PR_FREEBUSY_ENTRYIDS[1] to open folder the LocalFreeBusy msg
                 $localFreebusyMsg = mapi_msgstore_openentry($userStore, $userRootProps[PR_FREEBUSY_ENTRYIDS][1]);
-                if($localFreebusyMsg){
+                if ($localFreebusyMsg) {
                     $props = mapi_getprops($localFreebusyMsg, array(PR_PROCESS_MEETING_REQUESTS, PR_DECLINE_RECURRING_MEETING_REQUESTS, PR_DECLINE_CONFLICTING_MEETING_REQUESTS));
 
                     $acceptMeetingRequests = isset($props[PR_PROCESS_MEETING_REQUESTS]) ? $props[PR_PROCESS_MEETING_REQUESTS] : false;
                     $declineRecurringMeetingRequests = isset($props[PR_DECLINE_RECURRING_MEETING_REQUESTS]) ? $props[PR_DECLINE_RECURRING_MEETING_REQUESTS] : false;
                     $declineConflictingMeetingRequests = isset($props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS]) ? $props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS] : false;
 
-                    if(!$acceptMeetingRequests){
+                    if (!$acceptMeetingRequests) {
                         /**
                          * When a resource has not been set to automatically accept meeting requests,
                          * the meeting request has to be sent to him rather than being put directly into
@@ -2449,14 +2449,14 @@ 
                          */
                         //$errorSetResource = 2;
                         $this->nonAcceptingResources[] = $resourceRecipients[$i];
-                    }else{
-                        if($declineRecurringMeetingRequests && !$cancel){
+                    } else {
+                        if ($declineRecurringMeetingRequests && !$cancel) {
                             // Check if appointment is recurring
-                            if($messageprops[ $this->proptags['recurring'] ]){
+                            if ($messageprops[$this->proptags['recurring']]) {
                                 $this->errorSetResource = 3;
                             }
                         }
-                        if($declineConflictingMeetingRequests && !$cancel){
+                        if ($declineConflictingMeetingRequests && !$cancel) {
                             // Check for conflicting items
                             if ($calFolder && $this->isMeetingConflicting($message, $userStore, $calFolder)) {
                                 $this->errorSetResource = 4; // Conflict
@@ -2466,7 +2466,7 @@ 
                 }
             }
 
-            if(!$this->errorSetResource && $accessToFolder){
+            if (!$this->errorSetResource && $accessToFolder) {
                 /**
                  * First search on GlobalID(0x3)
                  * If (recurring and occurrence) If Resource was booked for only this occurrence then Resource should have only this occurrence in Calendar and not whole series.
@@ -2480,7 +2480,7 @@ 
                  * OR
                  * 2) We were looking for occurrence item but Resource has whole series
                  */
-                if(empty($rows)){
+                if (empty($rows)) {
                     /**
                      * Now search on CleanGlobalID(0x23) WHY???
                      * Because we are looking recurring item
@@ -2494,7 +2494,7 @@ 
                     $newResourceMsg = false;
                     if (!empty($rows)) {
                         // Since we are looking for recurring item, open every result and check for 'recurring' property.
-                        foreach($rows as $row) {
+                        foreach ($rows as $row) {
                             $ResourceMsg = mapi_msgstore_openentry($userStore, $row);
                             $ResourceMsgProps = mapi_getprops($ResourceMsg, array($this->proptags['recurring']));
 
@@ -2508,18 +2508,18 @@ 
                     // Still no results found. I giveup, create new message.
                     if (!$newResourceMsg)
                         $newResourceMsg = mapi_folder_createmessage($calFolder);
-                }else{
+                } else {
                     $newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
                 }
 
                 // Prefix the subject if needed
-                if($prefix && isset($messageprops[PR_SUBJECT])) {
-                    $messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
+                if ($prefix && isset($messageprops[PR_SUBJECT])) {
+                    $messageprops[PR_SUBJECT] = $prefix.$messageprops[PR_SUBJECT];
                 }
 
                 // Set status to cancelled if needed
                 $messageprops[$this->proptags['busystatus']] = fbBusy; // The default status (Busy)
-                if($cancel) {
+                if ($cancel) {
                     $messageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // The meeting has been canceled
                     $messageprops[$this->proptags['busystatus']] = fbFree; // Free
                 } else {
@@ -2540,11 +2540,11 @@ 
                 $defaultStoreProps = mapi_getprops($defaultStore, array(PR_ENTRYID));
 
                 // @FIXME use entryid comparison functions here
-                if($storeProps[PR_ENTRYID] !== $defaultStoreProps[PR_ENTRYID]) {
+                if ($storeProps[PR_ENTRYID] !== $defaultStoreProps[PR_ENTRYID]) {
                     // get delegate information
                     $addrInfo = $this->getOwnerAddress($defaultStore, false);
 
-                    if($addrInfo) {
+                    if ($addrInfo) {
                         list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
 
                         $messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
@@ -2557,7 +2557,7 @@ 
                     // get delegator information
                     $addrInfo = $this->getOwnerAddress($this->store, false);
 
-                    if($addrInfo) {
+                    if ($addrInfo) {
                         list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
 
                         $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
@@ -2570,7 +2570,7 @@ 
                     // get organizer information
                     $addrinfo = $this->getOwnerAddress($this->store);
 
-                    if($addrinfo) {
+                    if ($addrinfo) {
                         list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrinfo;
 
                         $messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
@@ -2600,7 +2600,7 @@ 
                     $this->addOrganizer($messageprops, $recips, true);
 
                     // Update occurrence
-                    if($recurr->isException($basedate))
+                    if ($recurr->isException($basedate))
                         $recurr->modifyException($messageprops, $basedate, $recips);
                     else
                         $recurr->createException($messageprops, $basedate, false, $recips);
@@ -2629,16 +2629,16 @@ 
                     'msg' => $newResourceMsg,
                 );
                 $this->includesResources = true;
-            }else{
+            } else {
                 /**
                  * If no other errors occurred and you have no access to the
                  * folder of the resource, throw an error=1.
                  */
-                if(!$this->errorSetResource){
+                if (!$this->errorSetResource) {
                     $this->errorSetResource = 1;
                 }
 
-                for($j = 0, $len = count($resourceRecipData); $j < $len; $j++){
+                for ($j = 0, $len = count($resourceRecipData); $j < $len; $j++) {
                     // Get the EntryID
                     $props = mapi_message_getprops($resourceRecipData[$j]['msg']);
 
@@ -2655,7 +2655,7 @@ 
         // Get resource recipients
         $getResourcesRestriction = Array(RES_AND,
             Array(Array(RES_PROPERTY,
-                Array(RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+                Array(RELOP => RELOP_EQ, // Equals recipient type 3: Resource
                     ULPROPTAG => PR_RECIPIENT_TYPE,
                     VALUE => array(PR_RECIPIENT_TYPE =>MAPI_BCC)
                 )
@@ -2663,9 +2663,9 @@ 
         );
         $recipienttable = mapi_message_getrecipienttable($message);
         $resourceRecipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $getResourcesRestriction);
-        if(!empty($resourceRecipients)){
+        if (!empty($resourceRecipients)) {
             // Set Tracking status of resource recipients to olResponseAccepted (3)
-            for($i = 0, $len = count($resourceRecipients); $i < $len; $i++){
+            for ($i = 0, $len = count($resourceRecipients); $i < $len; $i++) {
                 $resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusAccepted;
                 $resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS_TIME] = time();
             }
@@ -2673,16 +2673,16 @@ 
         }
 
         // Publish updated free/busy information
-        if(!$this->errorSetResource){
-            for($i = 0, $len = count($resourceRecipData); $i < $len; $i++){
+        if (!$this->errorSetResource) {
+            for ($i = 0, $len = count($resourceRecipData); $i < $len; $i++) {
                 $storeProps = mapi_getprops($resourceRecipData[$i]['store'], array(PR_MAILBOX_OWNER_ENTRYID));
-                if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID])){
+                if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID])) {
                     $start = time() - 7 * 24 * 60 * 60;
                     $range = strtotime("+6 month");
                     $range = $range - (7 * 24 * 60 * 60);
 
                     $pub = new FreeBusyPublish($this->session, $resourceRecipData[$i]['store'], $resourceRecipData[$i]['folder'], $storeProps[PR_MAILBOX_OWNER_ENTRYID]);
-                    $pub->publishFB($start, $range ); // publish from one week ago, 6 months ahead
+                    $pub->publishFB($start, $range); // publish from one week ago, 6 months ahead
                 }
             }
         }
@@ -2717,7 +2717,7 @@ 
             $res = array(RES_PROPERTY, array(
                                             RELOP => RELOP_NE,
                                             ULPROPTAG => PR_EMAIL_ADDRESS,
-                                            VALUE => array( PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS] )
+                                            VALUE => array(PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS])
                                         )
                         );
             $recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
@@ -2737,7 +2737,7 @@ 
         $exception_props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
 
         if (isset($exception_props[$this->proptags['intendedbusystatus']])) {
-            if($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
+            if ($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
                 $exception_props[$this->proptags['busystatus']] = fbTentative;
             } else {
                 $exception_props[$this->proptags['busystatus']] = $exception_props[$this->proptags['intendedbusystatus']];
@@ -2747,17 +2747,17 @@ 
             $exception_props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
         }
 
-        if($userAction) {
+        if ($userAction) {
             $addrInfo = $this->getOwnerAddress($this->store);
 
             // if user has responded then set replytime and name
             $exception_props[$this->proptags['replytime']] = time();
-            if(!empty($addrInfo)) {
+            if (!empty($addrInfo)) {
                 $exception_props[$this->proptags['apptreplyname']] = $addrInfo[0];
             }
         }
 
-        if($recurr->isException($basedate)) {
+        if ($recurr->isException($basedate)) {
             $recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
         } else {
             $recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
@@ -2795,7 +2795,7 @@ 
         $reciptable = mapi_message_getrecipienttable($occurrenceItem);
         $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 
-        if($recurr->isException($basedate)) {
+        if ($recurr->isException($basedate)) {
             $recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
         } else {
             $recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
@@ -2839,7 +2839,7 @@ 
             $newmessageprops[$this->proptags['is_exception']] = true;
 
             // Set to high importance
-            if($cancel) $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
+            if ($cancel) $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
 
             // Set startdate and enddate of exception
             if ($cancel && $recurObject) {
@@ -2873,9 +2873,9 @@ 
             );
 
             // In direct-booking mode, we don't need to send cancellations to resources
-            if($this->enableDirectBooking) {
+            if ($this->enableDirectBooking) {
                 $restriction[1][] = Array(RES_PROPERTY,
-                                        Array(RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+                                        Array(RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
                                             ULPROPTAG => PR_RECIPIENT_TYPE,
                                             VALUE => array(PR_RECIPIENT_TYPE => MAPI_BCC)
                                         )
@@ -2906,19 +2906,19 @@ 
 
         $meetingTimeInfo = $this->getMeetingTimeInfo();
 
-        if($meetingTimeInfo)
+        if ($meetingTimeInfo)
             $newmessageprops[PR_BODY] = $meetingTimeInfo;
 
         // Send all recurrence info in mail, if this is a recurrence meeting.
         if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']]) {
-            if(!empty($messageprops[$this->proptags['recurring_pattern']])) {
+            if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
                 $newmessageprops[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
             }
             $newmessageprops[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
             $newmessageprops[$this->proptags['timezone_data']] = $messageprops[$this->proptags['timezone_data']];
             $newmessageprops[$this->proptags['timezone']] = $messageprops[$this->proptags['timezone']];
 
-            if($recurObject) {
+            if ($recurObject) {
                 $this->generateRecurDates($recurObject, $messageprops, $newmessageprops);
             }
         }
@@ -2929,9 +2929,9 @@ 
 
         // 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']]) &&
+        if (isset($newmessageprops[$this->proptags['categories']]) &&
             !empty($newmessageprops[$this->proptags['categories']])) {
             unset($newmessageprops[$this->proptags['categories']]);
         }
@@ -2944,13 +2944,13 @@ 
         $stripResourcesRestriction = Array(RES_AND,
                                 Array(
                                     Array(RES_BITMASK,
-                                        Array(    ULTYPE        =>    BMR_EQZ,
+                                        Array(ULTYPE        =>    BMR_EQZ,
                                                 ULPROPTAG    =>    PR_RECIPIENT_FLAGS,
                                                 ULMASK        =>    recipExceptionalDeleted
                                         )
                                     ),
                                     Array(RES_BITMASK,
-                                        Array(    ULTYPE        =>    BMR_EQZ,
+                                        Array(ULTYPE        =>    BMR_EQZ,
                                                 ULPROPTAG    =>    PR_RECIPIENT_FLAGS,
                                                 ULMASK        =>    recipOrganizer
                                         )
@@ -2959,10 +2959,10 @@ 
         );
 
         // In direct-booking mode, resources do not receive a meeting request
-        if($this->enableDirectBooking) {
+        if ($this->enableDirectBooking) {
             $stripResourcesRestriction[1][] =
                                     Array(RES_PROPERTY,
-                                        Array(RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+                                        Array(RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
                                             ULPROPTAG => PR_RECIPIENT_TYPE,
                                             VALUE => array(PR_RECIPIENT_TYPE => MAPI_BCC)
                                         )
@@ -2997,7 +2997,7 @@ 
             $recipients[] = $this->nonAcceptingResources[$i];
         }*/
 
-        if(!empty($modifiedRecips)) {
+        if (!empty($modifiedRecips)) {
             // Strip out the sender/'owner' recipient
             mapi_message_modifyrecipients($new, MODRECIP_ADD, $modifiedRecips);
 
@@ -3068,9 +3068,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);
@@ -3119,7 +3119,7 @@ 
      */
     function generateRecurDates($recurObject, $messageprops, &$newmessageprops)
     {
-        if($messageprops[$this->proptags['startdate']] && $messageprops[$this->proptags['duedate']]) {
+        if ($messageprops[$this->proptags['startdate']] && $messageprops[$this->proptags['duedate']]) {
             $startDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['startdate']]));
             $endDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['duedate']]));
 
@@ -3128,12 +3128,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]);
         }
     }
 
@@ -3155,16 +3155,16 @@ 
         $outgoing = mapi_folder_createmessage($outbox);
 
         // check if $store is set and it is not equal to $defaultStore (means its the delegation case)
-        if($store !== false) {
+        if ($store !== false) {
             $storeProps = mapi_getprops($store, array(PR_ENTRYID));
             $userStoreProps = mapi_getprops($userStore, array(PR_ENTRYID));
 
             // @FIXME use entryid comparison functions here
-            if($storeProps[PR_ENTRYID] !== $userStoreProps[PR_ENTRYID]) {
+            if ($storeProps[PR_ENTRYID] !== $userStoreProps[PR_ENTRYID]) {
                 // get the delegator properties and set it into outgoing mail
                 $delegatorDetails = $this->getOwnerAddress($store, false);
 
-                if($delegatorDetails) {
+                if ($delegatorDetails) {
                     list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegatorDetails;
                     $sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
                     $sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
@@ -3176,7 +3176,7 @@ 
                 // get the delegate properties and set it into outgoing mail
                 $delegateDetails = $this->getOwnerAddress($userStore, false);
 
-                if($delegateDetails) {
+                if ($delegateDetails) {
                     list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegateDetails;
                     $sentprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
                     $sentprops[PR_SENDER_NAME] = $ownername;
@@ -3189,7 +3189,7 @@ 
             // normal user is sending mail, so both set of properties will be same
             $userDetails = $this->getOwnerAddress($userStore);
 
-            if($userDetails) {
+            if ($userDetails) {
                 list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $userDetails;
                 $sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
                 $sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
@@ -3224,7 +3224,7 @@ 
 
         $props = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], $this->proptags['updatecounter'], $this->proptags['meetingtype'], $this->proptags['owner_critical_change']));
 
-        if(!$this->isMeetingRequest($props[PR_MESSAGE_CLASS])) {
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS])) {
             return $result;
         }
 
@@ -3239,10 +3239,10 @@ 
 
         // if basedate is provided and we could not find the item then it could be that we are checking
         // an exception so get the exception and check it
-        if($basedate && $calendarItem !== false) {
+        if ($basedate && $calendarItem !== false) {
             $exception = $this->getExceptionItem($calendarItem, $basedate);
 
-            if($exception !== false) {
+            if ($exception !== false) {
                 // we are able to find the exception compare with it
                 $calendarItem = $exception;
             } else {
@@ -3252,7 +3252,7 @@ 
             }
         }
 
-        if($calendarItem !== false) {
+        if ($calendarItem !== false) {
             $calendarItemProps = mapi_getprops($calendarItem, array(
                                                     $this->proptags['owner_critical_change'],
                                                     $this->proptags['updatecounter']
@@ -3262,7 +3262,7 @@ 
 
             $criticalChange = (isset($calendarItemProps[$this->proptags['owner_critical_change']]) && $props[$this->proptags['owner_critical_change']] < $calendarItemProps[$this->proptags['owner_critical_change']]);
 
-            if($updateCounter || $criticalChange) {
+            if ($updateCounter || $criticalChange) {
                 // meeting request is out of date, set properties to indicate this
                 mapi_setprops($this->message, array($this->proptags['meetingtype'] => mtgOutOfDate, PR_ICON_INDEX => 1033));
                 mapi_savechanges($this->message);
@@ -3285,18 +3285,18 @@ 
 
         $props = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->proptags['updatecounter']));
 
-        if(!$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS])) {
+        if (!$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS])) {
             return $result;
         }
 
         $calendarItem = $this->getCorrespondentCalendarItem(true);
 
-        if($calendarItem !== false) {
+        if ($calendarItem !== false) {
             // basedate is provided so open exception
-            if($basedate !== false) {
+            if ($basedate !== false) {
                 $exception = $this->getExceptionItem($calendarItem, $basedate);
 
-                if($exception !== false) {
+                if ($exception !== false) {
                     // we are able to find the exception compare with it
                     $calendarItem = $exception;
                 } else {
@@ -3306,15 +3306,15 @@ 
                 }
             }
 
-            if($calendarItem !== false) {
+            if ($calendarItem !== false) {
                 $calendarItemProps = mapi_getprops($calendarItem, array($this->proptags['updatecounter']));
 
                 /*
                  * if(message_counter < appointment_counter) meeting object is newer then meeting response (meeting is updated)
                  * if(message_counter >= appointment_counter) meeting is not updated, do normal processing
                  */
-                if(isset($calendarItemProps[$this->proptags['updatecounter']], $props[$this->proptags['updatecounter']])) {
-                    if($props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) {
+                if (isset($calendarItemProps[$this->proptags['updatecounter']], $props[$this->proptags['updatecounter']])) {
+                    if ($props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) {
                         $result = true;
                     }
                 }
@@ -3342,9 +3342,9 @@ 
         $attach = null;
 
         // If basedate is specified then we need to open exception message to clear recipient responses
-        if($basedate) {
+        if ($basedate) {
             $recurrence = new Recurrence($this->store, $this->message);
-            if($recurrence->isException($basedate)){
+            if ($recurrence->isException($basedate)) {
                 $attach = $recurrence->getExceptionAttachment($basedate);
                 if ($attach) {
                     $message = mapi_attach_openobj($attach, MAPI_MODIFY);
@@ -3355,14 +3355,14 @@ 
             $message = $this->message;
         }
 
-        if(!$message) {
+        if (!$message) {
             return;
         }
 
         $newProps = mapi_getprops($message, array($this->proptags['startdate'], $this->proptags['duedate'], $this->proptags['updatecounter']));
 
         // Check whether message is updated or not.
-        if(isset($newProps[$this->proptags['updatecounter']]) && $newProps[$this->proptags['updatecounter']] == 0) {
+        if (isset($newProps[$this->proptags['updatecounter']]) && $newProps[$this->proptags['updatecounter']] == 0) {
             return;
         }
 
@@ -3389,8 +3389,8 @@ 
         $recipTable = mapi_message_getrecipienttable($message);
         $recipsRows = mapi_table_queryallrows($recipTable, $this->recipprops);
 
-        foreach($recipsRows as $recipient) {
-            if(($recipient[PR_RECIPIENT_FLAGS] & recipOrganizer) != recipOrganizer){
+        foreach ($recipsRows as $recipient) {
+            if (($recipient[PR_RECIPIENT_FLAGS] & recipOrganizer) != recipOrganizer) {
                 // Recipient is attendee, set the trackstatus to 'Not Responded'
                 $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
             } else {
@@ -3416,7 +3416,7 @@ 
     {
         $props = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_ENTRYID));
 
-        if(!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
             // can work only with meeting requests/responses/cancellations
             return false;
         }
@@ -3454,9 +3454,9 @@ 
         }
 
         // there should be only one item returned
-        if(!empty($entryids) && count($entryids) === 1) {
+        if (!empty($entryids) && count($entryids) === 1) {
             // return only entryid
-            if($open === false) {
+            if ($open === false) {
                 return $entryids[0];
             }
 
@@ -3482,11 +3482,11 @@ 
         $props = mapi_getprops($this->message, array(PR_RCVD_REPRESENTING_ENTRYID, $this->proptags['recurring']));
 
         // check if the passed item is recurring series
-        if($props[$this->proptags['recurring']] !== false) {
+        if ($props[$this->proptags['recurring']] !== false) {
             return false;
         }
 
-        if($store === false) {
+        if ($store === false) {
             // If Delegate is processing Meeting Request/Response for Delegator then retrieve Delegator's store and calendar.
             if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
                 $delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID]);
@@ -3498,7 +3498,7 @@ 
 
         $recurr = new Recurrence($store, $recurringMessage);
         $attach = $recurr->getExceptionAttachment($basedate);
-        if($attach) {
+        if ($attach) {
             $occurItem = mapi_attach_openobj($attach);
         }
 
@@ -3519,7 +3519,7 @@ 
         $returnValue = false;
         $noOfInstances = 0;
 
-        if($message === false) {
+        if ($message === false) {
             $message = $this->message;
         }
 
@@ -3538,7 +3538,7 @@ 
                 )
         );
 
-        if($userStore === false) {
+        if ($userStore === false) {
             $userStore = $this->store;
 
             // check if delegate is processing the response
@@ -3550,16 +3550,16 @@ 
             }
         }
 
-        if($calFolder === false) {
+        if ($calFolder === false) {
             $calFolder = $this->openDefaultCalendar($userStore);
         }
 
-        if($calFolder) {
+        if ($calFolder) {
             // Meeting request is recurring, so get all occurrence and check for each occurrence whether it conflicts with other appointments in Calendar.
             if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
                 // Apply recurrence class and retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
                 $recurr = new Recurrence($userStore, $message);
-                $items = $recurr->getItems($messageProps[$this->proptags['clipstart']], $messageProps[$this->proptags['clipend']] * (24*24*60), 30);
+                $items = $recurr->getItems($messageProps[$this->proptags['clipstart']], $messageProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
 
                 foreach ($items as $item) {
                     // Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
@@ -3571,7 +3571,7 @@ 
                              * Only meeting requests have globalID, normal appointments do not have globalID
                              * so if any normal appointment if found then it is assumed to be conflict.
                              */
-                            if(isset($calendarItem[$this->proptags['goid']])) {
+                            if (isset($calendarItem[$this->proptags['goid']])) {
                                 if ($calendarItem[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']]) {
                                     $noOfInstances++;
                                     break;
@@ -3584,14 +3584,14 @@ 
                     }
                 }
 
-                if($noOfInstances > 0) {
+                if ($noOfInstances > 0) {
                     $returnValue = $noOfInstances;
                 }
             } else {
                 // Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
                 $items = getCalendarItems($userStore, $calFolder, $messageProps[$this->proptags['startdate']], $messageProps[$this->proptags['duedate']], array($this->proptags['goid'], $this->proptags['busystatus']));
 
-                if(isset($messageProps[$this->proptags['basedate']]) && !empty($messageProps[$this->proptags['basedate']])) {
+                if (isset($messageProps[$this->proptags['basedate']]) && !empty($messageProps[$this->proptags['basedate']])) {
                     $basedate = $messageProps[$this->proptags['basedate']];
                     // Get the goid2 from recurring MR which further used to
                     // check the resource conflicts item.
@@ -3600,9 +3600,9 @@ 
                     $messageProps[$this->proptags['goid2']] = $recurrItemProps[$this->proptags['goid2']];
                 }
 
-                foreach($items as $item) {
+                foreach ($items as $item) {
                     if ($item[$this->proptags['busystatus']] !== fbFree) {
-                        if(isset($item[$this->proptags['goid']])) {
+                        if (isset($item[$this->proptags['goid']])) {
                             if (($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']])
                                 && ($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid2']])) {
                                 $returnValue = true;
@@ -3632,12 +3632,12 @@ 
     {
         $hasDelegator = false;
         // Check if meeting already has an organizer.
-        foreach ($recipients as $key => $recipient){
+        foreach ($recipients as $key => $recipient) {
             if (isset($messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) && $recipient[PR_EMAIL_ADDRESS] == $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS])
                 $hasDelegator = true;
         }
 
-        if (!$hasDelegator){
+        if (!$hasDelegator) {
             // Create delegator.
             $delegator = array();
             $delegator[PR_ENTRYID] = $messageProps[PR_RCVD_REPRESENTING_ENTRYID];
@@ -3645,7 +3645,7 @@ 
             $delegator[PR_EMAIL_ADDRESS] = $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS];
             $delegator[PR_RECIPIENT_TYPE] = MAPI_TO;
             $delegator[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_RCVD_REPRESENTING_NAME];
-            $delegator[PR_ADDRTYPE] = empty($messageProps[PR_RCVD_REPRESENTING_ADDRTYPE]) ? 'SMTP':$messageProps[PR_RCVD_REPRESENTING_ADDRTYPE];
+            $delegator[PR_ADDRTYPE] = empty($messageProps[PR_RCVD_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_RCVD_REPRESENTING_ADDRTYPE];
             $delegator[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
             $delegator[PR_RECIPIENT_FLAGS] = recipSendable;
             $delegator[PR_SEARCH_KEY] = $messageProps[PR_RCVD_REPRESENTING_SEARCH_KEY];
@@ -3668,19 +3668,19 @@ 
         $delegatorStore = $this->openCustomUserStore($receivedRepresentingEntryId);
         $returnData['store'] = $delegatorStore;
 
-        if(!empty($foldersToOpen)) {
-            for($index = 0, $len = count($foldersToOpen); $index < $len; $index++) {
+        if (!empty($foldersToOpen)) {
+            for ($index = 0, $len = count($foldersToOpen); $index < $len; $index++) {
                 $folderType = $foldersToOpen[$index];
 
                 // first try with default folders
                 $folder = $this->openDefaultFolder($folderType, $delegatorStore);
 
                 // if folder not found then try with base folders
-                if($folder === false) {
+                if ($folder === false) {
                     $folder = $this->openBaseFolder($folderType, $delegatorStore);
                 }
 
-                if($folder === false) {
+                if ($folder === false) {
                     // we are still not able to get the folder so give up
                     continue;
                 }
@@ -3728,7 +3728,7 @@ 
         $recurrence = new Recurrence($store, $calendarItem);
 
         //Retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
-        $items = $recurrence->getItems($calendarItemProps[$this->proptags['clipstart']], $calendarItemProps[$this->proptags['clipend']] * (24*24*60), 30);
+        $items = $recurrence->getItems($calendarItemProps[$this->proptags['clipstart']], $calendarItemProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
         $localCategories = array();
 
         foreach ($items as $item) {

Braces +59 added lines, -44 removed lines

@@ -278,11 +278,13 @@ 
      */
     function processMeetingRequestResponse()
     {
-        if(!$this->isMeetingRequestResponse())
-            return;
+        if(!$this->isMeetingRequestResponse()) {
+                    return;
+        }
 
-        if(!$this->isLocalOrganiser())
-            return;
+        if(!$this->isLocalOrganiser()) {
+                    return;
+        }
 
         // Get information we need from the response message
         $messageprops = mapi_getprops($this->message, Array(
@@ -449,8 +451,9 @@ 
 
                 mapi_message_modifyrecipients($calendarItem, MODRECIP_MODIFY, Array($recipient));
             }
-            if(isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted)
-                $acceptedrecips++;
+            if(isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
+                            $acceptedrecips++;
+            }
         }
 
         // If the recipient was not found in the original calendar item,
@@ -489,7 +492,7 @@ 
             $props = Array();
             if($messageprops[$this->proptags['counter_proposal']]){
                 $props[$this->proptags['counter_proposal']] = true;
-            }else{
+            } else{
                 $props[$this->proptags['counter_proposal']] = false;
             }
 
@@ -1029,8 +1032,7 @@ 
                                                         )
                                         );
                             $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-                        } 
-                        else {
+                        } else {
                             $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
                         }
                         $this->addOrganizer($props, $recipients);
@@ -1042,8 +1044,7 @@ 
                     }
                 }
             }
-        } 
-        else {
+        } else {
             // Here only properties are set on calendaritem, because user is responding from calendar.
             $props = array();
             $props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
@@ -1382,8 +1383,9 @@ 
         // Length of the random data
         $goid .= pack('V', 16);
         // Random data.
-        for ($i=0; $i<16; $i++)
-            $goid .= chr(rand(0, 255));
+        for ($i=0; $i<16; $i++) {
+                    $goid .= chr(rand(0, 255));
+        }
 
         // Create a new appointment id for this item
         $apptid = rand();
@@ -1494,7 +1496,7 @@ 
                 'error' => $this->errorSetResource,
                 'displayname' => $this->recipientDisplayname
             );
-        }else{
+        } else{
             return true;
         }
     }
@@ -1993,8 +1995,9 @@ 
         $props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
 
         $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];
+        if(isset($messageprops[PR_OWNER_APPT_ID])) {
+                    $props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
+        }
 
         // Set GlobalId AND CleanGlobalId, if exception then also set basedate into GlobalId(0x3).
         $props[$this->proptags['goid']] = $this->setBasedateInGlobalID($messageprops[$this->proptags['goid2']], $basedate);
@@ -2061,8 +2064,9 @@ 
 
         $rows = mapi_table_queryallrows($calendarcontents, Array(PR_ENTRYID), $restrict);
 
-        if(empty($rows))
-            return;
+        if(empty($rows)) {
+                    return;
+        }
 
         $calendaritems = Array();
 
@@ -2128,8 +2132,9 @@ 
      */
     function getOwnerAddress($store, $fallbackToLoggedInUser = true)
     {
-        if(!$this->session)
-            return false;
+        if(!$this->session) {
+                    return false;
+        }
 
         $storeProps = mapi_getprops($store, array(PR_MAILBOX_OWNER_ENTRYID, PR_USER_ENTRYID));
 
@@ -2146,8 +2151,9 @@ 
             $ab = mapi_openaddressbook($this->session);
 
             $zarafaUser = mapi_ab_openentry($ab, $ownerEntryId);
-            if(!$zarafaUser)
-                return false;
+            if(!$zarafaUser) {
+                            return false;
+            }
 
             $ownerProps = mapi_getprops($zarafaUser, array(PR_ADDRTYPE, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SEARCH_KEY));
 
@@ -2176,8 +2182,9 @@ 
             }
         }
 
-        if(!$entryid)
-            return false;
+        if(!$entryid) {
+                    return false;
+        }
 
         return mapi_openmsgstore($this->session, $entryid);
     }
@@ -2248,10 +2255,11 @@ 
         $month = hexdec(substr($hexbase, 4, 2));
         $year = hexdec(substr($hexbase, 0, 4));
 
-        if ($day && $month && $year)
-            return gmmktime(0, 0, 0, $month, $day, $year);
-        else
-            return false;
+        if ($day && $month && $year) {
+                    return gmmktime(0, 0, 0, $month, $day, $year);
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -2449,7 +2457,7 @@ 
                          */
                         //$errorSetResource = 2;
                         $this->nonAcceptingResources[] = $resourceRecipients[$i];
-                    }else{
+                    } else{
                         if($declineRecurringMeetingRequests && !$cancel){
                             // Check if appointment is recurring
                             if($messageprops[ $this->proptags['recurring'] ]){
@@ -2506,9 +2514,10 @@ 
                     }
 
                     // Still no results found. I giveup, create new message.
-                    if (!$newResourceMsg)
-                        $newResourceMsg = mapi_folder_createmessage($calFolder);
-                }else{
+                    if (!$newResourceMsg) {
+                                            $newResourceMsg = mapi_folder_createmessage($calFolder);
+                    }
+                } else{
                     $newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
                 }
 
@@ -2600,10 +2609,11 @@ 
                     $this->addOrganizer($messageprops, $recips, true);
 
                     // Update occurrence
-                    if($recurr->isException($basedate))
-                        $recurr->modifyException($messageprops, $basedate, $recips);
-                    else
-                        $recurr->createException($messageprops, $basedate, false, $recips);
+                    if($recurr->isException($basedate)) {
+                                            $recurr->modifyException($messageprops, $basedate, $recips);
+                    } else {
+                                            $recurr->createException($messageprops, $basedate, false, $recips);
+                    }
                 } else {
 
                     mapi_setprops($newResourceMsg, $messageprops);
@@ -2629,7 +2639,7 @@ 
                     'msg' => $newResourceMsg,
                 );
                 $this->includesResources = true;
-            }else{
+            } else{
                 /**
                  * If no other errors occurred and you have no access to the
                  * folder of the resource, throw an error=1.
@@ -2839,7 +2849,9 @@ 
             $newmessageprops[$this->proptags['is_exception']] = true;
 
             // Set to high importance
-            if($cancel) $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
+            if($cancel) {
+                $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
+            }
 
             // Set startdate and enddate of exception
             if ($cancel && $recurObject) {
@@ -2906,8 +2918,9 @@ 
 
         $meetingTimeInfo = $this->getMeetingTimeInfo();
 
-        if($meetingTimeInfo)
-            $newmessageprops[PR_BODY] = $meetingTimeInfo;
+        if($meetingTimeInfo) {
+                    $newmessageprops[PR_BODY] = $meetingTimeInfo;
+        }
 
         // Send all recurrence info in mail, if this is a recurrence meeting.
         if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']]) {
@@ -2928,8 +2941,9 @@ 
         }
 
         // Prefix the subject if needed
-        if ($prefix && isset($newmessageprops[PR_SUBJECT]))
-            $newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+        if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
+                    $newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+        }
 
         if(isset($newmessageprops[$this->proptags['categories']]) &&
             !empty($newmessageprops[$this->proptags['categories']])) {
@@ -3633,8 +3647,9 @@ 
         $hasDelegator = false;
         // Check if meeting already has an organizer.
         foreach ($recipients as $key => $recipient){
-            if (isset($messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) && $recipient[PR_EMAIL_ADDRESS] == $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS])
-                $hasDelegator = true;
+            if (isset($messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) && $recipient[PR_EMAIL_ADDRESS] == $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) {
+                            $hasDelegator = true;
+            }
         }
 
         if (!$hasDelegator){