grommunio / grommunio-sync

mapi/class.freebusypublish.php

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;
                     }
 

mapi/mapidefs.php

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

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

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

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) {

mapi/class.baserecurrence.php

Spacing +284 added lines, -284 removed lines

@@ -52,14 +52,14 @@ 
         {
             $this->store = $store;
 
-            if(is_array($message)) {
+            if (is_array($message)) {
                 $this->messageprops = $message;
             } else {
                 $this->message = $message;
                 $this->messageprops = mapi_getprops($this->message, $this->proptags);
             }
 
-            if(isset($this->messageprops[$this->proptags["recurring_data"]])) {
+            if (isset($this->messageprops[$this->proptags["recurring_data"]])) {
                 // There is a possibility that recurr blob can be more than 255 bytes so get full blob through stream interface
                 if (strlen($this->messageprops[$this->proptags["recurring_data"]]) >= 255) {
                     $this->getFullRecurrenceBlob();
@@ -67,7 +67,7 @@ 
 
                 $this->recur = $this->parseRecurrence($this->messageprops[$this->proptags["recurring_data"]]);
             }
-            if(isset($this->proptags["timezone_data"], $this->messageprops[$this->proptags["timezone_data"]])) {
+            if (isset($this->proptags["timezone_data"], $this->messageprops[$this->proptags["timezone_data"]])) {
                 $this->tz = $this->parseTimezone($this->messageprops[$this->proptags["timezone_data"]]);
             }
         }
@@ -171,7 +171,7 @@ 
                     $ret["everyn"] = $data["everyn"];
                     $ret["regen"] = $data["regen"];
 
-                    switch($ret["subtype"])
+                    switch ($ret["subtype"])
                     {
                         case 0:
                             $rdata = substr($rdata, 12);
@@ -271,7 +271,7 @@ 
 
             // exc_base_dates are *all* the base dates that have been either deleted or modified
             $exc_base_dates = array();
-            for($i = 0; $i < $ret["numexcept"]; $i++)
+            for ($i = 0; $i < $ret["numexcept"]; $i++)
             {
                 if (strlen($rdata) < 4) {
                     // We shouldn't arrive here, because that implies
@@ -296,7 +296,7 @@ 
             // exc_changed are the base dates of *modified* occurrences. exactly what is modified
             // is in the attachments *and* in the data further down this function.
             $exc_changed = array();
-            for($i = 0; $i < $ret["numexceptmod"]; $i++)
+            for ($i = 0; $i < $ret["numexceptmod"]; $i++)
             {
                 if (strlen($rdata) < 4) {
                     // We shouldn't arrive here, because that implies
@@ -338,7 +338,7 @@ 
             $exc_changed_details = array();
 
             // Parse n modified exceptions
-            for($i=0;$i<$nexceptions;$i++)
+            for ($i = 0; $i < $nexceptions; $i++)
             {
                 $item = array();
 
@@ -365,13 +365,13 @@ 
 
                 // ARO_SUBJECT: 0x0001
                 // Look for field: SubjectLength (2b), SubjectLength2 (2b) and Subject
-                if(($bitmask &(1 << 0))) {
+                if (($bitmask &(1 << 0))) {
                     $data = unpack("vnull_length/vlength", $rdata);
                     $rdata = substr($rdata, 4);
 
                     $length = $data["length"];
                     $item["subject"] = ""; // Normalized subject
-                    for($j = 0; $j < $length && strlen($rdata); $j++)
+                    for ($j = 0; $j < $length && strlen($rdata); $j++)
                     {
                         $data = unpack("Cchar", $rdata);
                         $rdata = substr($rdata, 1);
@@ -381,14 +381,14 @@ 
                 }
 
                 // ARO_MEETINGTYPE: 0x0002
-                if(($bitmask &(1 << 1))) {
+                if (($bitmask &(1 << 1))) {
                     $rdata = substr($rdata, 4);
                     // Attendees modified: no data here (only in attachment)
                 }
 
                 // ARO_REMINDERDELTA: 0x0004
                 // Look for field: ReminderDelta (4b)
-                if(($bitmask &(1 << 2))) {
+                if (($bitmask &(1 << 2))) {
                     $data = unpack("Vremind_before", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -397,7 +397,7 @@ 
 
                 // ARO_REMINDER: 0x0008
                 // Look field: ReminderSet (4b)
-                if(($bitmask &(1 << 3))) {
+                if (($bitmask &(1 << 3))) {
                     $data = unpack("Vreminder_set", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -407,7 +407,7 @@ 
                 // ARO_LOCATION: 0x0010
                 // Look for fields: LocationLength (2b), LocationLength2 (2b) and Location
                 // Similar to ARO_SUBJECT above.
-                if(($bitmask &(1 << 4))) {
+                if (($bitmask &(1 << 4))) {
                     $data = unpack("vnull_length/vlength", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -422,7 +422,7 @@ 
 
                 // ARO_BUSYSTATUS: 0x0020
                 // Look for field: BusyStatus (4b)
-                if(($bitmask &(1 << 5))) {
+                if (($bitmask &(1 << 5))) {
                     $data = unpack("Vbusystatus", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -430,14 +430,14 @@ 
                 }
 
                 // ARO_ATTACHMENT: 0x0040
-                if(($bitmask &(1 << 6))) {
+                if (($bitmask &(1 << 6))) {
                     // no data: RESERVED
                     $rdata = substr($rdata, 4);
                 }
 
                 // ARO_SUBTYPE: 0x0080
                 // Look for field: SubType (4b). Determines whether it is an allday event.
-                if(($bitmask &(1 << 7))) {
+                if (($bitmask &(1 << 7))) {
                     $data = unpack("Vallday", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -446,7 +446,7 @@ 
 
                 // ARO_APPTCOLOR: 0x0100
                 // Look for field: AppointmentColor (4b)
-                if(($bitmask &(1 << 8))) {
+                if (($bitmask &(1 << 8))) {
                     $data = unpack("Vlabel", $rdata);
                     $rdata = substr($rdata, 4);
 
@@ -454,7 +454,7 @@ 
                 }
 
                 // ARO_EXCEPTIONAL_BODY: 0x0200
-                if(($bitmask &(1 << 9))) {
+                if (($bitmask &(1 << 9))) {
                     // Notes or Attachments modified: no data here (only in attachment)
                 }
 
@@ -471,16 +471,16 @@ 
             // Find deleted occurrences
             $deleted_occurences = array();
 
-            foreach($exc_base_dates as $base_date) {
+            foreach ($exc_base_dates as $base_date) {
                 $found = false;
 
-                foreach($exc_changed_details as $details) {
-                    if($details["basedate"] == $base_date) {
+                foreach ($exc_changed_details as $details) {
+                    if ($details["basedate"] == $base_date) {
                         $found = true;
                         break;
                     }
                 }
-                if(! $found) {
+                if (!$found) {
                     // item was not in exc_changed_details, so it must be deleted
                     $deleted_occurences[] = $base_date;
                 }
@@ -497,7 +497,7 @@ 
             $data = unpack("Vreservedsize", $rdata);
             $rdata = substr($rdata, 4 + $data["reservedsize"]);
 
-            for($i=0;$i<$nexceptions;$i++)
+            for ($i = 0; $i < $nexceptions; $i++)
             {
                 // subject and location in ucs-2 to utf-8
                 if ($writerversion >= 0x3009) {
@@ -564,48 +564,48 @@ 
         function saveRecurrence()
         {
             // Only save if a message was passed
-            if(!isset($this->message))
+            if (!isset($this->message))
                 return;
 
             // Abort if no recurrence was set
-            if(!isset($this->recur["type"], $this->recur["subtype"], $this->recur["start"], $this->recur["end"], $this->recur["startocc"], $this->recur["endocc"])) {
+            if (!isset($this->recur["type"], $this->recur["subtype"], $this->recur["start"], $this->recur["end"], $this->recur["startocc"], $this->recur["endocc"])) {
                 return;
             }
 
-            $rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int) $this->recur["type"], 0x20, (int) $this->recur["subtype"]);
+            $rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int)$this->recur["type"], 0x20, (int)$this->recur["subtype"]);
 
             $weekstart = 1; //monday
             $forwardcount = 0;
             $restocc = 0;
-            $dayofweek = (int) gmdate("w", (int) $this->recur["start"]); //0 (for Sunday) through 6 (for Saturday)
+            $dayofweek = (int)gmdate("w", (int)$this->recur["start"]); //0 (for Sunday) through 6 (for Saturday)
 
-            $term = (int) $this->recur["type"];
-            switch($term)
+            $term = (int)$this->recur["type"];
+            switch ($term)
             {
                 case 0x0A:
                     // Daily
-                    if(!isset($this->recur["everyn"])) {
+                    if (!isset($this->recur["everyn"])) {
                         return;
                     }
 
-                    if($this->recur["subtype"] == 1) {
+                    if ($this->recur["subtype"] == 1) {
 
                         // Daily every workday
                         $rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
                     } else {
                         // Daily every N days (everyN in minutes)
 
-                        $everyn =  ((int) $this->recur["everyn"]) / 1440;
+                        $everyn = ((int)$this->recur["everyn"]) / 1440;
 
                         // Calc first occ
-                        $firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+                        $firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int)$this->recur["everyn"]);
 
-                        $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
+                        $rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
                     }
                     break;
                 case 0x0B:
                     // Weekly
-                    if(!isset($this->recur["everyn"])) {
+                    if (!isset($this->recur["everyn"])) {
                         return;
                     }
 
@@ -620,9 +620,9 @@ 
                         // Find the first day that matches one of the weekdays selected
                         $daycount = 0;
                         $dayskip = -1;
-                        for($j = 0; $j < 7; $j++) {
-                            if(((int) $this->recur["weekdays"]) & (1<<( ($dayofweek+$j)%7)) ) {
-                                if($dayskip == -1)
+                        for ($j = 0; $j < 7; $j++) {
+                            if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+                                if ($dayskip == -1)
                                     $dayskip = $j;
 
                                 $daycount++;
@@ -633,80 +633,80 @@ 
                         // $daycount is the number of days per week that an occurrence occurs
 
                         $weekskip = 0;
-                        if(($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek+$dayskip) > 6)
+                        if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6)
                             $weekskip = 1;
 
                         // Check if the recurrence ends after a number of occurences, in that case we must calculate the
                         // remaining occurences based on the start of the recurrence.
-                        if (((int) $this->recur["term"]) == 0x22) {
+                        if (((int)$this->recur["term"]) == 0x22) {
                             // $weekskip is the amount of weeks to skip from the startdate before the first occurence
                             // $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
                             // is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
                             // (eg when numoccur = 2, and daycount = 1)
-                            $forwardcount = floor( (int) ($this->recur["numoccur"] -1 ) / $daycount);
+                            $forwardcount = floor((int)($this->recur["numoccur"] - 1) / $daycount);
 
                             // $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
                             // for the occurrence on the first day
-                            $restocc = ((int) $this->recur["numoccur"]) - ($forwardcount*$daycount) - 1;
+                            $restocc = ((int)$this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
 
                             // $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-                            $forwardcount *= (int) $this->recur["everyn"];
+                            $forwardcount *= (int)$this->recur["everyn"];
                         }
 
                         // The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-                        $this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24*60*60)+ ($weekskip *(((int) $this->recur["everyn"]) - 1) * 7 * 24*60*60);
+                        $this->recur["start"] = ((int)$this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
                     }
 
                     // Calc first occ
-                    $firstocc = ($this->unixDataToRecurData($this->recur["start"]) ) % ( ((int) $this->recur["everyn"]) * 7 * 24 * 60);
+                    $firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int)$this->recur["everyn"]) * 7 * 24 * 60);
 
-                    $firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
+                    $firstocc -= (((int)gmdate("w", (int)$this->recur["start"])) - 1) * 24 * 60;
 
                     if ($this->recur["regen"])
-                        $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
+                        $rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], 1);
                     else
-                        $rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+                        $rdata .= pack("VVVV", $firstocc, (int)$this->recur["everyn"], 0, (int)$this->recur["weekdays"]);
                     break;
                 case 0x0C:
                     // Monthly
                 case 0x0D:
                     // Yearly
-                    if(!isset($this->recur["everyn"])) {
+                    if (!isset($this->recur["everyn"])) {
                         return;
                     }
-                    if($term == 0x0D /*yearly*/ && !isset($this->recur["month"])) {
+                    if ($term == 0x0D /*yearly*/ && !isset($this->recur["month"])) {
                         return;
                     }
 
-                    if($term == 0x0C /*monthly*/) {
-                        $everyn = (int) $this->recur["everyn"];
-                    }else {
-                        $everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+                    if ($term == 0x0C /*monthly*/) {
+                        $everyn = (int)$this->recur["everyn"];
+                    } else {
+                        $everyn = $this->recur["regen"] ? ((int)$this->recur["everyn"]) * 12 : 12;
                     }
 
                     // Get montday/month/year of original start
-                    $curmonthday = gmdate("j", (int) $this->recur["start"] );
-                    $curyear = gmdate("Y", (int) $this->recur["start"] );
-                    $curmonth = gmdate("n", (int) $this->recur["start"] );
+                    $curmonthday = gmdate("j", (int)$this->recur["start"]);
+                    $curyear = gmdate("Y", (int)$this->recur["start"]);
+                    $curmonth = gmdate("n", (int)$this->recur["start"]);
 
                     // Check if the recurrence ends after a number of occurences, in that case we must calculate the
                     // remaining occurences based on the start of the recurrence.
-                    if (((int) $this->recur["term"]) == 0x22) {
+                    if (((int)$this->recur["term"]) == 0x22) {
                         // $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
                         // one to make sure there are always at least one occurrence left)
-                        $forwardcount = ((((int) $this->recur["numoccur"])-1) * $everyn );
+                        $forwardcount = ((((int)$this->recur["numoccur"]) - 1) * $everyn);
                     }
 
                     // Get month for yearly on D'th day of month M
-                    if($term == 0x0D /*yearly*/) {
-                        $selmonth = floor(((int) $this->recur["month"]) / (24 * 60 *29)) + 1; // 1=jan, 2=feb, eg
+                    if ($term == 0x0D /*yearly*/) {
+                        $selmonth = floor(((int)$this->recur["month"]) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
                     }
 
-                    switch((int) $this->recur["subtype"])
+                    switch ((int)$this->recur["subtype"])
                     {
                         // on D day of every M month
                         case 2:
-                            if(!isset($this->recur["monthday"])) {
+                            if (!isset($this->recur["monthday"])) {
                                 return;
                             }
                             // Recalc startdate
@@ -714,13 +714,13 @@ 
                             // Set on the right begin day
 
                             // Go the beginning of the month
-                            $this->recur["start"] -= ($curmonthday-1) * 24*60*60;
+                            $this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
                             // Go the the correct month day
-                            $this->recur["start"] += (((int) $this->recur["monthday"])-1) * 24*60*60;
+                            $this->recur["start"] += (((int)$this->recur["monthday"]) - 1) * 24 * 60 * 60;
 
                             // If the previous calculation gave us a start date different than the original start date, then we need to skip to the first occurrence
-                            if ( ($term == 0x0C /*monthly*/ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-                                ($term == 0x0D /*yearly*/ && ( $selmonth != $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)) ))
+                            if (($term == 0x0C /*monthly*/ && ((int)$this->recur["monthday"]) < $curmonthday) ||
+                                ($term == 0x0D /*yearly*/ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int)$this->recur["monthday"]) < $curmonthday))))
                             {
                                 if ($term == 0x0D /*yearly*/) {
                                     if ($curmonth > $selmonth) {//go to next occurrence in 'everyn' months minus difference in first occurrence and original date
@@ -729,7 +729,7 @@ 
                                         $count = $selmonth - $curmonth;
                                     } else {
                                         // Go to next occurrence while recurrence start date is greater than occurrence date but within same month
-                                        if (((int) $this->recur["monthday"]) < $curmonthday) {
+                                        if (((int)$this->recur["monthday"]) < $curmonthday) {
                                             $count = $everyn;
                                         }
                                     }
@@ -738,10 +738,10 @@ 
                                 }
 
                                 // Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
-                                for($i=0; $i < $count; $i++) {
+                                for ($i = 0; $i < $count; $i++) {
                                     $this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
 
-                                    if($curmonth == 12) {
+                                    if ($curmonth == 12) {
                                         $curyear++;
                                         $curmonth = 0;
                                     }
@@ -754,110 +754,110 @@ 
                             // of each month will overshoot in february (29 days). We compensate for that by checking
                             // if the day of the month we got is wrong, and then back up to the last day of the previous
                             // month.
-                            if(((int) $this->recur["monthday"]) >=28 && ((int) $this->recur["monthday"]) <= 31 &&
-                                gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"]))
+                            if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+                                gmdate("j", ((int)$this->recur["start"])) < ((int)$this->recur["monthday"]))
                             {
-                                $this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 *60;
+                                $this->recur["start"] -= gmdate("j", ((int)$this->recur["start"])) * 24 * 60 * 60;
                             }
 
                             // "start" is now the first occurrence
 
-                            if($term == 0x0C /*monthly*/) {
+                            if ($term == 0x0C /*monthly*/) {
                                 // Calc first occ
-                                $monthIndex = ((((12%$everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601)%$everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1))%$everyn;
+                                $monthIndex = ((((12 % $everyn) * ((((int)gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
                                 $firstocc = 0;
-                                for($i=0; $i < $monthIndex; $i++) {
-                                    $firstocc+= $this->getMonthInSeconds(1601 + floor($i/12), ($i%12)+1) / 60;
+                                for ($i = 0; $i < $monthIndex; $i++) {
+                                    $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
                                 }
 
-                                $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
-                            } else{
+                                $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
+                            } else {
                                 // Calc first occ
                                 $firstocc = 0;
-                                $monthIndex = (int) gmdate("n", $this->recur["start"]);
-                                for($i=1; $i < $monthIndex; $i++) {
-                                    $firstocc+= $this->getMonthInSeconds(1601 + floor($i/12), $i) / 60;
+                                $monthIndex = (int)gmdate("n", $this->recur["start"]);
+                                for ($i = 1; $i < $monthIndex; $i++) {
+                                    $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
                                 }
 
-                                $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+                                $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
                             }
                             break;
 
                         case 3:
                             // monthly: on Nth weekday of every M month
                             // yearly: on Nth weekday of M month
-                            if(!isset($this->recur["weekdays"], $this->recur["nday"])) {
+                            if (!isset($this->recur["weekdays"], $this->recur["nday"])) {
                                 return;
                             }
 
-                            $weekdays = (int) $this->recur["weekdays"];
-                            $nday = (int) $this->recur["nday"];
+                            $weekdays = (int)$this->recur["weekdays"];
+                            $nday = (int)$this->recur["nday"];
 
                             // Calc startdate
-                            $monthbegindow = (int) $this->recur["start"];
+                            $monthbegindow = (int)$this->recur["start"];
 
-                            if($nday == 5) {
+                            if ($nday == 5) {
                                 // Set date on the last day of the last month
-                                $monthbegindow += (gmdate("t", $monthbegindow ) - gmdate("j", $monthbegindow )) * 24 * 60 * 60;
-                            }else {
+                                $monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+                            } else {
                                 // Set on the first day of the month
-                                $monthbegindow -= ((gmdate("j", $monthbegindow )-1) * 24 * 60 * 60);
+                                $monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
                             }
 
-                            if($term == 0x0D /*yearly*/) {
+                            if ($term == 0x0D /*yearly*/) {
                                 // Set on right month
-                                if($selmonth < $curmonth)
+                                if ($selmonth < $curmonth)
                                     $tmp = 12 - $curmonth + $selmonth;
                                 else
                                     $tmp = ($selmonth - $curmonth);
 
-                                for($i=0; $i < $tmp; $i++) {
+                                for ($i = 0; $i < $tmp; $i++) {
                                     $monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
 
-                                    if($curmonth == 12) {
+                                    if ($curmonth == 12) {
                                         $curyear++;
                                         $curmonth = 0;
                                     }
                                     $curmonth++;
                                 }
 
-                            }else {
+                            } else {
                                 // Check or you exist in the right month
 
                                 $dayofweek = gmdate("w", $monthbegindow);
-                                for($i = 0; $i < 7; $i++) {
-                                    if($nday == 5 && (($dayofweek-$i)%7 >= 0) && (1<<( ($dayofweek-$i)%7) ) & $weekdays) {
+                                for ($i = 0; $i < 7; $i++) {
+                                    if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                         $day = gmdate("j", $monthbegindow) - $i;
                                         break;
-                                    }else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
-                                        $day = (($nday-1)*7) + ($i+1);
+                                    } else if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
+                                        $day = (($nday - 1) * 7) + ($i + 1);
                                         break;
                                     }
                                 }
 
                                 // Goto the next X month
-                                if(isset($day) && ($day < gmdate("j", (int) $this->recur["start"])) ) {
-                                    if($nday == 5) {
+                                if (isset($day) && ($day < gmdate("j", (int)$this->recur["start"]))) {
+                                    if ($nday == 5) {
                                         $monthbegindow += 24 * 60 * 60;
-                                        if($curmonth == 12) {
+                                        if ($curmonth == 12) {
                                             $curyear++;
                                             $curmonth = 0;
                                         }
                                         $curmonth++;
                                     }
 
-                                    for($i=0; $i < $everyn; $i++) {
+                                    for ($i = 0; $i < $everyn; $i++) {
                                         $monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
 
-                                        if($curmonth == 12) {
+                                        if ($curmonth == 12) {
                                             $curyear++;
                                             $curmonth = 0;
                                         }
                                         $curmonth++;
                                     }
 
-                                    if($nday == 5) {
+                                    if ($nday == 5) {
                                         $monthbegindow -= 24 * 60 * 60;
                                     }
                                 }
@@ -868,37 +868,37 @@ 
                             $day = 0;
                             // Set start on the right day
                             $dayofweek = gmdate("w", $monthbegindow);
-                            for($i = 0; $i < 7; $i++) {
-                                if($nday == 5 && (($dayofweek-$i)%7) >= 0&& (1<<(($dayofweek-$i)%7) ) & $weekdays) {
+                            for ($i = 0; $i < 7; $i++) {
+                                if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                     $day = $i;
                                     break;
-                                }else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
-                                    $day = ($nday - 1) * 7 + ($i+1);
+                                } else if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
+                                    $day = ($nday - 1) * 7 + ($i + 1);
                                     break;
                                 }
                             }
-                            if($nday == 5)
-                                $monthbegindow -= $day * 24 * 60 *60;
+                            if ($nday == 5)
+                                $monthbegindow -= $day * 24 * 60 * 60;
                             else
-                                $monthbegindow += ($day-1) * 24 * 60 *60;
+                                $monthbegindow += ($day - 1) * 24 * 60 * 60;
 
                             $firstocc = 0;
 
-                            if($term == 0x0C /*monthly*/) {
+                            if ($term == 0x0C /*monthly*/) {
                                 // Calc first occ
-                                $monthIndex = ((((12%$everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601)%$everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1))%$everyn;
+                                $monthIndex = ((((12 % $everyn) * (((int)gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
-                                for($i=0; $i < $monthIndex; $i++) {
-                                    $firstocc+= $this->getMonthInSeconds(1601 + floor($i/12), ($i%12)+1) / 60;
+                                for ($i = 0; $i < $monthIndex; $i++) {
+                                    $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
                                 }
 
                                 $rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
                             } else {
                                 // Calc first occ
-                                $monthIndex = (int) gmdate("n", $this->recur["start"]);
+                                $monthIndex = (int)gmdate("n", $this->recur["start"]);
 
-                                for($i=1; $i < $monthIndex; $i++) {
-                                    $firstocc+= $this->getMonthInSeconds(1601 + floor($i/12), $i) / 60;
+                                for ($i = 1; $i < $monthIndex; $i++) {
+                                    $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
                                 }
 
                                 $rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
@@ -911,15 +911,15 @@ 
 
             }
 
-            if(!isset($this->recur["term"])) {
+            if (!isset($this->recur["term"])) {
                 return;
             }
 
             // Terminate
-            $term = (int) $this->recur["term"];
+            $term = (int)$this->recur["term"];
             $rdata .= pack("CCCC", $term, 0x20, 0x00, 0x00);
 
-            switch($term)
+            switch ($term)
             {
                 // After the given enddate
                 case 0x21:
@@ -927,11 +927,11 @@ 
                     break;
                 // After a number of times
                 case 0x22:
-                    if(!isset($this->recur["numoccur"])) {
+                    if (!isset($this->recur["numoccur"])) {
                         return;
                     }
 
-                    $rdata .= pack("V", (int) $this->recur["numoccur"]);
+                    $rdata .= pack("V", (int)$this->recur["numoccur"]);
                     break;
                 // Never ends
                 case 0x23:
@@ -940,7 +940,7 @@ 
             }
 
             // Strange little thing for the recurrence type "every workday"
-            if(((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
+            if (((int)$this->recur["type"]) == 0x0B && ((int)$this->recur["subtype"]) == 1) {
                 $rdata .= pack("V", 1);
             } else { // Other recurrences
                 $rdata .= pack("V", 0);
@@ -955,21 +955,21 @@ 
             // Merge deleted and changed items into one list
             $items = $deleted_items;
 
-            foreach($changed_items as $changed_item)
+            foreach ($changed_items as $changed_item)
                 array_push($items, $changed_item["basedate"]);
 
             sort($items);
 
             // Add the merged list in to the rdata
             $rdata .= pack("V", count($items));
-            foreach($items as $item)
+            foreach ($items as $item)
                 $rdata .= pack("V", $this->unixDataToRecurData($item));
 
             // Loop through the changed exceptions (not deleted)
             $rdata .= pack("V", count($changed_items));
             $items = array();
 
-            foreach($changed_items as $changed_item)
+            foreach ($changed_items as $changed_item)
             {
                 $items[] = $this->dayStartOf($changed_item["start"]);
             }
@@ -977,52 +977,52 @@ 
             sort($items);
 
             // Add the changed items list int the rdata
-            foreach($items as $item)
+            foreach ($items as $item)
                 $rdata .= pack("V", $this->unixDataToRecurData($item));
 
             // Set start date
-            $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
+            $rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["start"]));
 
             // Set enddate
-            switch($term)
+            switch ($term)
             {
                 // After the given enddate
                 case 0x21:
-                    $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+                    $rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
                     break;
                 // After a number of times
                 case 0x22:
                     // @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-                    $occenddate = (int) $this->recur["start"];
+                    $occenddate = (int)$this->recur["start"];
 
-                    switch((int) $this->recur["type"]) {
+                    switch ((int)$this->recur["type"]) {
                         case 0x0A: //daily
 
-                            if($this->recur["subtype"] == 1) {
+                            if ($this->recur["subtype"] == 1) {
                                 // Daily every workday
-                                $restocc = (int) $this->recur["numoccur"];
+                                $restocc = (int)$this->recur["numoccur"];
 
                                 // Get starting weekday
                                 $nowtime = $this->gmtime($occenddate);
                                 $j = $nowtime["tm_wday"];
 
-                                while(1)
+                                while (1)
                                 {
-                                    if(($j%7) > 0 && ($j%7)<6 ) {
+                                    if (($j % 7) > 0 && ($j % 7) < 6) {
                                         $restocc--;
                                     }
 
                                     $j++;
 
-                                    if($restocc <= 0)
+                                    if ($restocc <= 0)
                                         break;
 
-                                    $occenddate += 24*60*60;
+                                    $occenddate += 24 * 60 * 60;
                                 }
 
                             } else {
                                 // -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-                                $occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"]-1)));
+                                $occenddate += (((int)$this->recur["everyn"]) * 60 * (((int)$this->recur["numoccur"] - 1)));
                             }
                             break;
                         case 0x0B: //weekly
@@ -1031,42 +1031,42 @@ 
                             // $restocc - number of remaining occurrences after the week skip
 
                             // Add the weeks till the last item
-                            $occenddate+=($forwardcount*7*24*60*60);
+                            $occenddate += ($forwardcount * 7 * 24 * 60 * 60);
 
                             $dayofweek = gmdate("w", $occenddate);
 
                             // Loop through the last occurrences until we have had them all
-                            for($j = 1; $restocc>0; $j++)
+                            for ($j = 1; $restocc > 0; $j++)
                             {
                                 // Jump to the next week (which may be N weeks away) when going over the week boundary
-                                if((($dayofweek+$j)%7) == $weekstart)
-                                    $occenddate += (((int) $this->recur["everyn"])-1) * 7 * 24*60*60;
+                                if ((($dayofweek + $j) % 7) == $weekstart)
+                                    $occenddate += (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
 
                                 // If this is a matching day, once less occurrence to process
-                                if(((int) $this->recur["weekdays"]) & (1<<(($dayofweek+$j)%7)) ) {
+                                if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
                                     $restocc--;
                                 }
 
                                 // Next day
-                                $occenddate += 24*60*60;
+                                $occenddate += 24 * 60 * 60;
                             }
 
                             break;
                         case 0x0C: //monthly
                         case 0x0D: //yearly
 
-                            $curyear = gmdate("Y", (int) $this->recur["start"] );
-                            $curmonth = gmdate("n", (int) $this->recur["start"] );
+                            $curyear = gmdate("Y", (int)$this->recur["start"]);
+                            $curmonth = gmdate("n", (int)$this->recur["start"]);
                             // $forwardcount = months
 
-                            switch((int) $this->recur["subtype"])
+                            switch ((int)$this->recur["subtype"])
                             {
                                 case 2: // on D day of every M month
-                                    while($forwardcount > 0)
+                                    while ($forwardcount > 0)
                                     {
                                         $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
 
-                                        if($curmonth >=12) {
+                                        if ($curmonth >= 12) {
                                             $curmonth = 1;
                                             $curyear++;
                                         } else {
@@ -1076,26 +1076,26 @@ 
                                     }
 
                                     // compensation between 28 and 31
-                                    if(((int) $this->recur["monthday"]) >=28 && ((int) $this->recur["monthday"]) <= 31 &&
-                                        gmdate("j", $occenddate) < ((int) $this->recur["monthday"]))
+                                    if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+                                        gmdate("j", $occenddate) < ((int)$this->recur["monthday"]))
                                     {
-                                        if(gmdate("j", $occenddate) < 28)
-                                            $occenddate -= gmdate("j", $occenddate) * 24 * 60 *60;
+                                        if (gmdate("j", $occenddate) < 28)
+                                            $occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
                                         else
-                                            $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 *60;
+                                            $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
                                     }
 
 
                                     break;
                                 case 3: // on Nth weekday of every M month
-                                    $nday = (int) $this->recur["nday"]; //1 tot 5
-                                    $weekdays = (int) $this->recur["weekdays"];
+                                    $nday = (int)$this->recur["nday"]; //1 tot 5
+                                    $weekdays = (int)$this->recur["weekdays"];
 
 
-                                    while($forwardcount > 0)
+                                    while ($forwardcount > 0)
                                     {
                                         $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-                                        if($curmonth >=12) {
+                                        if ($curmonth >= 12) {
                                             $curmonth = 1;
                                             $curyear++;
                                         } else {
@@ -1105,21 +1105,21 @@ 
                                         $forwardcount--;
                                     }
 
-                                    if($nday == 5) {
+                                    if ($nday == 5) {
                                         // Set date on the last day of the last month
-                                        $occenddate += (gmdate("t", $occenddate ) - gmdate("j", $occenddate )) * 24 * 60 * 60;
-                                    }else {
+                                        $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+                                    } else {
                                         // Set date on the first day of the last month
-                                        $occenddate -= (gmdate("j", $occenddate )-1) * 24 * 60 * 60;
+                                        $occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
                                     }
 
                                     $dayofweek = gmdate("w", $occenddate);
-                                    for($i = 0; $i < 7; $i++) {
-                                        if($nday == 5 && (($dayofweek-$i)%7) >= 0&& (1<<(($dayofweek-$i)%7) ) & $weekdays) {
+                                    for ($i = 0; $i < 7; $i++) {
+                                        if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
                                             $occenddate -= $i * 24 * 60 * 60;
                                             break;
-                                        }else if($nday != 5 && (1<<(($dayofweek+$i)%7) ) & $weekdays) {
-                                            $occenddate +=  ($i + (($nday-1) *7)) * 24 * 60 * 60;
+                                        } else if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
+                                            $occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
                                             break;
                                         }
                                     }
@@ -1136,7 +1136,7 @@ 
 
                     $this->recur["end"] = $occenddate;
 
-                    $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]) );
+                    $rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
                     break;
                 // Never ends
                 case 0x23:
@@ -1147,12 +1147,12 @@ 
             }
 
             // UTC date
-            $utcstart = $this->toGMT($this->tz, (int) $this->recur["start"]);
-            $utcend = $this->toGMT($this->tz, (int) $this->recur["end"]);
+            $utcstart = $this->toGMT($this->tz, (int)$this->recur["start"]);
+            $utcend = $this->toGMT($this->tz, (int)$this->recur["end"]);
 
             //utc date+time
-            $utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int) $this->recur["startocc"])*60) : $utcstart;
-            $utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int) $this->recur["endocc"]) * 60) : $utcstart;
+            $utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int)$this->recur["startocc"]) * 60) : $utcstart;
+            $utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int)$this->recur["endocc"]) * 60) : $utcstart;
 
             $propsToSet = array();
             // update reminder time
@@ -1170,7 +1170,7 @@ 
 
                 // recurrencetype
                 // Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
-                $propsToSet[$this->proptags["recurrencetype"]] = ((int) $this->recur["type"]) - 0x9;
+                $propsToSet[$this->proptags["recurrencetype"]] = ((int)$this->recur["type"]) - 0x9;
 
                 // set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
                 $propsToSet[$this->proptags["side_effects"]] = 369;
@@ -1183,25 +1183,25 @@ 
             // to the 'next' occurrence; this makes sure that deleting the next occurrence will correctly set the reminder to
             // the occurrence after that. The 'next' occurrence is defined as being the first occurrence that starts at moment X (server time)
             // with the reminder flag set.
-            $reminderprops = mapi_getprops($this->message, array($this->proptags["reminder_minutes"]) );
-            if(isset($reminderprops[$this->proptags["reminder_minutes"]]) ) {
+            $reminderprops = mapi_getprops($this->message, array($this->proptags["reminder_minutes"]));
+            if (isset($reminderprops[$this->proptags["reminder_minutes"]])) {
                 $occ = false;
                 $occurrences = $this->getItems(time(), 0x7ff00000, 3, true);
 
-                for($i = 0, $len = count($occurrences) ; $i < $len; $i++) {
+                for ($i = 0, $len = count($occurrences); $i < $len; $i++) {
                     // This will actually also give us appointments that have already started, but not yet ended. Since we want the next
                     // reminder that occurs after time(), we may have to skip the first few entries. We get 3 entries since that is the maximum
                     // number that would be needed (assuming reminder for item X cannot be before the previous occurrence starts). Worst case:
                     // time() is currently after start but before end of item, but reminder of next item has already passed (reminder for next item
                     // can be DURING the previous item, eg daily allday events). In that case, the first and second items must be skipped.
 
-                    if(($occurrences[$i][$this->proptags["startdate"]] - $reminderprops[$this->proptags["reminder_minutes"]] * 60) > time()) {
+                    if (($occurrences[$i][$this->proptags["startdate"]] - $reminderprops[$this->proptags["reminder_minutes"]] * 60) > time()) {
                         $occ = $occurrences[$i];
                         break;
                     }
                 }
 
-                if($occ) {
+                if ($occ) {
                     $propsToSet[$this->proptags["flagdueby"]] = $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60);
                 } else {
                     // Last reminder passed, no reminders any more.
@@ -1214,9 +1214,9 @@ 
             // Second item (0x08) indicates the Outlook version (see documentation at the bottom of this file for more information)
             $rdata .= pack("VCCCC", 0x00003006, 0x08, 0x30, 0x00, 0x00);
 
-            if(isset($this->recur["startocc"], $this->recur["endocc"])) {
+            if (isset($this->recur["startocc"], $this->recur["endocc"])) {
                 // Set start and endtime in minutes
-                $rdata .= pack("VV", (int) $this->recur["startocc"], (int) $this->recur["endocc"]);
+                $rdata .= pack("VV", (int)$this->recur["startocc"], (int)$this->recur["endocc"]);
             }
 
             // Detailed exception data
@@ -1225,7 +1225,7 @@ 
 
             $rdata .= pack("v", count($changed_items));
 
-            foreach($changed_items as $changed_item)
+            foreach ($changed_items as $changed_item)
             {
                 // Set start and end time of exception
                 $rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
@@ -1236,38 +1236,38 @@ 
                 $bitmask = 0;
 
                 // Check for changed strings
-                if(isset($changed_item["subject"]))    {
+                if (isset($changed_item["subject"])) {
                     $bitmask |= 1 << 0;
                 }
 
-                if(isset($changed_item["remind_before"])) {
+                if (isset($changed_item["remind_before"])) {
                     $bitmask |= 1 << 2;
                 }
 
-                if(isset($changed_item["reminder_set"])) {
+                if (isset($changed_item["reminder_set"])) {
                     $bitmask |= 1 << 3;
                 }
 
-                if(isset($changed_item["location"])) {
+                if (isset($changed_item["location"])) {
                     $bitmask |= 1 << 4;
                 }
 
-                if(isset($changed_item["busystatus"])) {
+                if (isset($changed_item["busystatus"])) {
                     $bitmask |= 1 << 5;
                 }
 
-                if(isset($changed_item["alldayevent"])) {
+                if (isset($changed_item["alldayevent"])) {
                     $bitmask |= 1 << 7;
                 }
 
-                if(isset($changed_item["label"])) {
+                if (isset($changed_item["label"])) {
                     $bitmask |= 1 << 8;
                 }
 
                 $rdata .= pack("v", $bitmask);
 
                 // Set "subject"
-                if(isset($changed_item["subject"])) {
+                if (isset($changed_item["subject"])) {
                     // convert utf-8 to non-unicode blob string (us-ascii?)
                     $subject = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["subject"]);
                     $length = strlen($subject);
@@ -1275,30 +1275,30 @@ 
                     $rdata .= pack("a".$length, $subject);
                 }
 
-                if(isset($changed_item["remind_before"])) {
+                if (isset($changed_item["remind_before"])) {
                     $rdata .= pack("V", $changed_item["remind_before"]);
                 }
 
-                if(isset($changed_item["reminder_set"])) {
+                if (isset($changed_item["reminder_set"])) {
                     $rdata .= pack("V", $changed_item["reminder_set"]);
                 }
 
-                if(isset($changed_item["location"])) {
+                if (isset($changed_item["location"])) {
                     $location = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["location"]);
                     $length = strlen($location);
                     $rdata .= pack("vv", $length + 1, $length);
                     $rdata .= pack("a".$length, $location);
                 }
 
-                if(isset($changed_item["busystatus"])) {
+                if (isset($changed_item["busystatus"])) {
                     $rdata .= pack("V", $changed_item["busystatus"]);
                 }
 
-                if(isset($changed_item["alldayevent"])) {
+                if (isset($changed_item["alldayevent"])) {
                     $rdata .= pack("V", $changed_item["alldayevent"]);
                 }
 
-                if(isset($changed_item["label"])) {
+                if (isset($changed_item["label"])) {
                     $rdata .= pack("V", $changed_item["label"]);
                 }
             }
@@ -1306,30 +1306,30 @@ 
             $rdata .= pack("V", 0);
 
             // write extended data
-            foreach($changed_items as $changed_item)
+            foreach ($changed_items as $changed_item)
             {
                 $rdata .= pack("V", 0);
-                if(isset($changed_item["subject"]) || isset($changed_item["location"])) {
+                if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
                     $rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
                     $rdata .= pack("V", $this->unixDataToRecurData($changed_item["end"]));
                     $rdata .= pack("V", $this->unixDataToRecurData($changed_item["basedate"]));
                 }
 
-                if(isset($changed_item["subject"])) {
+                if (isset($changed_item["subject"])) {
                     $subject = iconv("UTF-8", "UCS-2LE", $changed_item["subject"]);
                     $length = iconv_strlen($subject, "UCS-2LE");
                     $rdata .= pack("v", $length);
-                    $rdata .= pack("a".$length*2, $subject);
+                    $rdata .= pack("a".$length * 2, $subject);
                 }
 
-                if(isset($changed_item["location"])) {
+                if (isset($changed_item["location"])) {
                     $location = iconv("UTF-8", "UCS-2LE", $changed_item["location"]);
                     $length = iconv_strlen($location, "UCS-2LE");
                     $rdata .= pack("v", $length);
-                    $rdata .= pack("a".$length*2, $location);
+                    $rdata .= pack("a".$length * 2, $location);
                 }
 
-                if(isset($changed_item["subject"]) || isset($changed_item["location"])) {
+                if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
                     $rdata .= pack("V", 0);
                 }
             }
@@ -1340,13 +1340,13 @@ 
             $propsToSet[$this->proptags["recurring_data"]] = $rdata;
             $propsToSet[$this->proptags["recurring"]] = true;
 
-            if(isset($this->tz) && $this->tz){
+            if (isset($this->tz) && $this->tz) {
                 $timezone = "GMT";
-                if($this->tz["timezone"]!=0){
+                if ($this->tz["timezone"] != 0) {
                     // Create user readable timezone information
-                    $timezone = sprintf("(GMT %s%02d:%02d)",    (-$this->tz["timezone"]>0 ? "+" : "-"),
-                                                            abs($this->tz["timezone"]/60),
-                                                            abs($this->tz["timezone"]%60));
+                    $timezone = sprintf("(GMT %s%02d:%02d)", (-$this->tz["timezone"] > 0 ? "+" : "-"),
+                                                            abs($this->tz["timezone"] / 60),
+                                                            abs($this->tz["timezone"] % 60));
                 }
                 $propsToSet[$this->proptags["timezone_data"]] = $this->getTimezoneData($this->tz);
                 $propsToSet[$this->proptags["timezone"]] = $timezone;
@@ -1362,7 +1362,7 @@ 
         */
         function recurDataToUnixData($rdate)
         {
-            return ($rdate - 194074560) * 60 ;
+            return ($rdate - 194074560) * 60;
         }
 
         /**
@@ -1408,18 +1408,18 @@ 
         }
 
         function isLeapYear($year) {
-            return ( $year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0) );
+            return ($year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0));
         }
 
         function getMonthInSeconds($year, $month)
         {
-            if( in_array($month, array(1,3,5,7,8,10,12) ) ) {
+            if (in_array($month, array(1, 3, 5, 7, 8, 10, 12))) {
                 $day = 31;
-            } else if( in_array($month, array(4,6,9,11) ) ) {
+            } else if (in_array($month, array(4, 6, 9, 11))) {
                 $day = 30;
             } else {
                 $day = 28;
-                if( $this->isLeapYear($year) == 1 )
+                if ($this->isLeapYear($year) == 1)
                     $day++;
             }
             return $day * 24 * 60 * 60;
@@ -1437,7 +1437,7 @@ 
         function getDateByYearMonthWeekDayHour($year, $month, $week, $day, $hour)
         {
             // get first day of month
-            $date = gmmktime(0,0,0,$month,0,$year + 1900);
+            $date = gmmktime(0, 0, 0, $month, 0, $year + 1900);
 
             // get wday info
             $gmdate = $this->gmtime($date);
@@ -1453,7 +1453,7 @@ 
             // if we are in the next month, then back up a week, because week '5' means
             // 'last week of month'
 
-            if($gmdate["tm_mon"]+1 != $month)
+            if ($gmdate["tm_mon"] + 1 != $month)
                 $date -= 7 * 24 * 60 * 60;
 
             return $date;
@@ -1466,7 +1466,7 @@ 
         function getTimezone($tz, $date)
         {
             // No timezone -> GMT (+0)
-            if(!isset($tz["timezone"]))
+            if (!isset($tz["timezone"]))
                 return 0;
 
             $dst = false;
@@ -1475,19 +1475,19 @@ 
             $dststart = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dststartmonth"], $tz["dststartweek"], 0, $tz["dststarthour"]);
             $dstend = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dstendmonth"], $tz["dstendweek"], 0, $tz["dstendhour"]);
 
-            if($dststart <= $dstend) {
+            if ($dststart <= $dstend) {
                 // Northern hemisphere, eg DST is during Mar-Oct
-                if($date > $dststart && $date < $dstend) {
+                if ($date > $dststart && $date < $dstend) {
                     $dst = true;
                 }
             } else {
                 // Southern hemisphere, eg DST is during Oct-Mar
-                if($date < $dstend || $date > $dststart) {
+                if ($date < $dstend || $date > $dststart) {
                     $dst = true;
                 }
             }
 
-            if($dst) {
+            if ($dst) {
                 return $tz["timezone"] + $tz["timezonedst"];
             } else {
                 return $tz["timezone"];
@@ -1511,7 +1511,7 @@ 
          */
         function parseTimezone($data)
         {
-            if(strlen($data) < 48)
+            if (strlen($data) < 48)
                 return;
 
             $tz = unpack("ltimezone/lunk/ltimezonedst/lunk/ldstendmonth/vdstendweek/vdstendhour/lunk/lunk/vunk/ldststartmonth/vdststartweek/vdststarthour/lunk/vunk", $data);
@@ -1520,7 +1520,7 @@ 
 
         function getTimezoneData($tz)
         {
-            $data = pack("lllllvvllvlvvlv", $tz["timezone"], 0, $tz["timezonedst"], 0, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendhour"], 0, 0, 0, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststarthour"], 0 ,0);
+            $data = pack("lllllvvllvlvvlv", $tz["timezone"], 0, $tz["timezonedst"], 0, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendhour"], 0, 0, 0, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststarthour"], 0, 0);
 
             return $data;
         }
@@ -1534,13 +1534,13 @@ 
         {
             $data = pack("lxxxxlxxxxlvvxxxxxxxxxxlvvxxxxxx",
                         $tz["timezone"],
-                        array_key_exists("timezonedst",$tz)?$tz["timezonedst"]:0,
-                        array_key_exists("dstendmonth",$tz)?$tz["dstendmonth"]:0,
-                        array_key_exists("dstendweek",$tz)?$tz["dstendweek"]:0,
-                        array_key_exists("dstendhour",$tz)?$tz["dstendhour"]:0,
-                        array_key_exists("dststartmonth",$tz)?$tz["dststartmonth"]:0,
-                        array_key_exists("dststartweek",$tz)?$tz["dststartweek"]:0,
-                        array_key_exists("dststarthour",$tz)?$tz["dststarthour"]:0
+                        array_key_exists("timezonedst", $tz) ? $tz["timezonedst"] : 0,
+                        array_key_exists("dstendmonth", $tz) ? $tz["dstendmonth"] : 0,
+                        array_key_exists("dstendweek", $tz) ? $tz["dstendweek"] : 0,
+                        array_key_exists("dstendhour", $tz) ? $tz["dstendhour"] : 0,
+                        array_key_exists("dststartmonth", $tz) ? $tz["dststartmonth"] : 0,
+                        array_key_exists("dststartweek", $tz) ? $tz["dststartweek"] : 0,
+                        array_key_exists("dststarthour", $tz) ? $tz["dststarthour"] : 0
                     );
 
             return $data;
@@ -1550,7 +1550,7 @@ 
          * toGMT returns a timestamp in GMT time for the time and timezone given
          */
         function toGMT($tz, $date) {
-            if(!isset($tz['timezone']))
+            if (!isset($tz['timezone']))
                 return $date;
             $offset = $this->getTimezone($tz, $date);
 
@@ -1616,18 +1616,18 @@ 
         {
             $items = array();
 
-            if(isset($this->recur)) {
+            if (isset($this->recur)) {
 
                 // Optimization: remindersonly and default reminder is off; since only exceptions with reminder set will match, just look which
                 // exceptions are in range and have a reminder set
-                if($remindersonly && (!isset($this->messageprops[$this->proptags["reminder"]]) || $this->messageprops[$this->proptags["reminder"]] == false)) {
+                if ($remindersonly && (!isset($this->messageprops[$this->proptags["reminder"]]) || $this->messageprops[$this->proptags["reminder"]] == false)) {
                     // Sort exceptions by start time
                     uasort($this->recur["changed_occurences"], array($this, "sortExceptionStart"));
 
                     // Loop through all changed exceptions
-                    foreach($this->recur["changed_occurences"] as $exception) {
+                    foreach ($this->recur["changed_occurences"] as $exception) {
                         // Check reminder set
-                        if(!isset($exception["reminder"]) || $exception["reminder"] == false)
+                        if (!isset($exception["reminder"]) || $exception["reminder"] == false)
                             continue;
 
                         // Convert to GMT
@@ -1635,12 +1635,12 @@ 
                         $occend = $this->toGMT($this->tz, $exception["end"]); // seb changed $tz to $this->tz
 
                         // Check range criterium
-                        if($occstart > $end || $occend < $start)
+                        if ($occstart > $end || $occend < $start)
                             continue;
 
                         // OK, add to items.
                         array_push($items, $this->getExceptionProperties($exception));
-                        if($limit && (count($items) == $limit))
+                        if ($limit && (count($items) == $limit))
                             break;
                     }
 
@@ -1652,7 +1652,7 @@ 
                 // From here on, the dates of the occurrences are calculated in local time, so the days we're looking
                 // at are calculated from the local time dates of $start and $end
                 // TODO use one isset
-                if(isset($this->recur['regen'], $this->action['datecompleted']) && $this->recur['regen']) {
+                if (isset($this->recur['regen'], $this->action['datecompleted']) && $this->recur['regen']) {
                     $daystart = $this->dayStartOf($this->action['datecompleted']);
                 } else {
                     $daystart = $this->dayStartOf($this->recur["start"]); // start on first day of occurrence
@@ -1660,7 +1660,7 @@ 
 
                 // Calculate the last day on which we want to be looking at a recurrence; this is either the end of the view
                 // or the end of the recurrence, whichever comes first
-                if($end > $this->toGMT($this->tz, $this->recur["end"])) {
+                if ($end > $this->toGMT($this->tz, $this->recur["end"])) {
                     $rangeend = $this->toGMT($this->tz, $this->recur["end"]);
                 } else {
                     $rangeend = $end;
@@ -1670,21 +1670,21 @@ 
 
                 // Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
 
-                switch($this->recur["type"])
+                switch ($this->recur["type"])
                 {
                 case 10:
                     // Daily
-                    if($this->recur["everyn"] <= 0)
+                    if ($this->recur["everyn"] <= 0)
                         $this->recur["everyn"] = 1440;
 
-                    if($this->recur["subtype"] == 0) {
+                    if ($this->recur["subtype"] == 0) {
                         // Every Nth day
-                        for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+                        for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
                             $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                         }
                     } else {
                         // Every workday
-                        for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440)
+                        for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440)
                         {
                             $nowtime = $this->gmtime($now);
                             if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
@@ -1695,25 +1695,25 @@ 
                     break;
                 case 11:
                     // Weekly
-                    if($this->recur["everyn"] <= 0)
+                    if ($this->recur["everyn"] <= 0)
                         $this->recur["everyn"] = 1;
 
                     // If sliding flag is set then move to 'n' weeks
                     if ($this->recur['regen']) $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
 
-                    for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"]))
+                    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"]))
                     {
                         if ($this->recur['regen']) {
                             $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                         } else {
                             // Loop through the whole following week to the first occurrence of the week, add each day that is specified
-                            for($wday = 0; $wday < 7; $wday++)
+                            for ($wday = 0; $wday < 7; $wday++)
                             {
                                 $daynow = $now + $wday * 60 * 60 * 24;
                                 //checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-                                if ($daynow <= $dayend){
+                                if ($daynow <= $dayend) {
                                     $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-                                    if(($this->recur["weekdays"] &(1 << $nowtime["tm_wday"]))) { // Selected ?
+                                    if (($this->recur["weekdays"] &(1 << $nowtime["tm_wday"]))) { // Selected ?
                                         $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                                     }
                                 }
@@ -1723,26 +1723,26 @@ 
                     break;
                 case 12:
                     // Monthly
-                    if($this->recur["everyn"] <= 0)
+                    if ($this->recur["everyn"] <= 0)
                         $this->recur["everyn"] = 1;
 
                     // Loop through all months from start to end of occurrence, starting at beginning of first month
-                    for($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
+                    for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60)
                     {
-                        if(isset($this->recur["monthday"]) &&($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+                        if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
                             $difference = 1;
                             if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
                                 $difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
                             }
                             $daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
                             //checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-                            if ($daynow <= $dayend){
+                            if ($daynow <= $dayend) {
                                 $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                             }
                         }
-                        else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+                        else if (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
                             // Sanitize input
-                            if($this->recur["weekdays"] == 0)
+                            if ($this->recur["weekdays"] == 0)
                                 $this->recur["weekdays"] = 1;
 
                             // If nday is not set to the last day in the month
@@ -1750,29 +1750,29 @@ 
                                 // keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
                                 $ndaycounter = 0;
                                 // Find matching weekday in this month
-                                for($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; $day++)
+                                for ($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; $day++)
                                 {
                                     $daynow = $now + $day * 60 * 60 * 24;
                                     $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
 
-                                    if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-                                        $ndaycounter ++;
+                                    if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+                                        $ndaycounter++;
                                     }
                                     // check the selected pattern is same as asked Nth weekday,If so set the firstday
-                                    if($this->recur["nday"] == $ndaycounter){
+                                    if ($this->recur["nday"] == $ndaycounter) {
                                         $firstday = $day;
                                         break;
                                     }
                                 }
                                 // $firstday is the day of the month on which the asked pattern of nth weekday matches
                                 $daynow = $now + $firstday * 60 * 60 * 24;
-                            }else{
+                            } else {
                                 // Find last day in the month ($now is the firstday of the month)
-                                $NumDaysInMonth =  $this->daysInMonth($now, 1);
-                                $daynow = $now + (($NumDaysInMonth-1) * 24*60*60);
+                                $NumDaysInMonth = $this->daysInMonth($now, 1);
+                                $daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
 
                                 $nowtime = $this->gmtime($daynow);
-                                while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))==0){
+                                while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
                                     $daynow -= 86400;
                                     $nowtime = $this->gmtime($daynow);
                                 }
@@ -1781,12 +1781,12 @@ 
                             /**
                              * checks weather the next coming day in recurrence pattern is less than or equal to end day of the            * recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
                              */
-                            if ($daynow <= $dayend && $daynow >= $daystart){
-                                $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz , $remindersonly);
+                            if ($daynow <= $dayend && $daynow >= $daystart) {
+                                $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                             }
                         } else if ($this->recur['regen']) {
                             $next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-                            $now = $daystart +($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+                            $now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
 
                             if ($now <= $dayend) {
                                 $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
@@ -1796,49 +1796,49 @@ 
                     break;
                 case 13:
                     // Yearly
-                    if($this->recur["everyn"] <= 0)
+                    if ($this->recur["everyn"] <= 0)
                         $this->recur["everyn"] = 12;
 
-                    for($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
+                    for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60)
                     {
-                        if(isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+                        if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
                             // recur["month"] is in minutes since the beginning of the year
                             $month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
                             $monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
                             $monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-                            if($monthday > $this->daysInMonth($monthstart, 1))
-                                $monthday = $this->daysInMonth($monthstart, 1);    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
-                            $daynow = $monthstart + ($monthday-1) * 24 * 60 * 60;
+                            if ($monthday > $this->daysInMonth($monthstart, 1))
+                                $monthday = $this->daysInMonth($monthstart, 1); // Cap $monthday on month length (eg 28 feb instead of 29 feb)
+                            $daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
                             $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                         }
-                        else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+                        else if (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
 
                             // Go the correct month
                             $monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
                             // Find first matching weekday in this month
-                            for($wday = 0; $wday < 7; $wday++)
+                            for ($wday = 0; $wday < 7; $wday++)
                             {
                                 $daynow = $monthnow + $wday * 60 * 60 * 24;
                                 $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
 
-                                if($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+                                if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
                                     $firstday = $wday;
                                     break;
                                 }
                             }
 
                             // Same as above (monthly)
-                            $daynow = $monthnow + ($firstday + ($this->recur["nday"]-1)*7) * 60 * 60 * 24;
+                            $daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
 
-                            while($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+                            while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
                                 $daynow -= 7 * 60 * 60 * 24;
                             }
 
                             $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                         } else if ($this->recur['regen']) {
                             $year_starttime = $this->gmtime($now);
-                            $is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+                            $is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
                             $now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /*year in seconds*/);
 
                             if ($now <= $dayend) {
@@ -1864,7 +1864,7 @@ 
             $aTime = $a[$this->proptags["startdate"]];
             $bTime = $b[$this->proptags["startdate"]];
 
-            return $aTime==$bTime?0:($aTime>$bTime?1:-1);
+            return $aTime == $bTime ? 0 : ($aTime > $bTime ? 1 : -1);
         }
 
         /**
@@ -1882,7 +1882,7 @@ 
         function daysInMonth($date, $months) {
             $days = 0;
 
-            for($i=0;$i<$months;$i++) {
+            for ($i = 0; $i < $months; $i++) {
                 $days += date("t", $date + $days * 24 * 60 * 60);
             }
 
@@ -1891,9 +1891,9 @@ 
 
         // Converts MAPI-style 'minutes' into the month of the year [0..11]
         function monthOfYear($minutes) {
-            $d = gmmktime(0,0,0,1,1,2001); // The year 2001 was a non-leap year, and the minutes provided are always in non-leap-year-minutes
+            $d = gmmktime(0, 0, 0, 1, 1, 2001); // The year 2001 was a non-leap year, and the minutes provided are always in non-leap-year-minutes
 
-            $d += $minutes*60;
+            $d += $minutes * 60;
 
             $dtime = $this->gmtime($d);
 
@@ -1902,6 +1902,6 @@ 
 
         function sortExceptionStart($a, $b)
         {
-            return $a["start"] == $b["start"] ? 0 : ($a["start"]  > $b["start"] ? 1 : -1 );
+            return $a["start"] == $b["start"] ? 0 : ($a["start"] > $b["start"] ? 1 : -1);
         }
     }

mapi/class.mapiexception.php

Spacing +2 added lines, -2 removed lines

@@ -22,10 +22,10 @@
          */
         public function getDisplayMessage()
         {
-            if(!empty($this->displayMessage))
+            if (!empty($this->displayMessage))
                 return $this->displayMessage;
 
-            switch($this->getCode())
+            switch ($this->getCode())
             {
                 case MAPI_E_NO_ACCESS:
                     return _("You have insufficient privileges to open this object.");

mapi/class.baseexception.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         // assign display message
         $this->displayMessage = $displayMessage;
 
-        parent::__construct($errorMessage, (int) $code, $previous);
+        parent::__construct($errorMessage, (int)$code, $previous);
     }
 
     /**
@@ -66,7 +66,7 @@ 
      */
     public function getFileLine()
     {
-        return $this->getBaseFile() . ':' . $this->getLine();
+        return $this->getBaseFile().':'.$this->getLine();
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function getDisplayMessage()
     {
-        if(!is_null($this->displayMessage)) {
+        if (!is_null($this->displayMessage)) {
             return $this->displayMessage;
         }
 
@@ -125,7 +125,7 @@ 
      */
     public function getBaseFile()
     {
-        if(is_null($this->baseFile)) {
+        if (is_null($this->baseFile)) {
             $this->baseFile = basename(parent::getFile());
         }
 

mapi/class.taskrecurrence.php

Spacing +13 added lines, -13 removed lines

@@ -74,12 +74,12 @@ 
         function setRecurrence(&$recur)
         {
             $this->recur = $recur;
-            $this->action =& $recur;
+            $this->action = & $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();
 
             if (!isset($this->recur['startocc'])) $this->recur['startocc'] = 0;
@@ -91,7 +91,7 @@ 
             // Update $this->recur with proper startrecurrdate and endrecurrdate updated after saving recurrence
             $msgProps = mapi_getprops($this->message, array($this->proptags['recurring_data']));
             $recurring_data = $this->parseRecurrence($msgProps[$this->proptags['recurring_data']]);
-            foreach($recurring_data as $key => $value) {
+            foreach ($recurring_data as $key => $value) {
                 $this->recur[$key] = $value;
             }
 
@@ -107,9 +107,9 @@ 
         function setFirstOccurrence()
         {
             // Check if it is already the first occurrence
-            if($this->action['start'] == $this->recur["start"]){
+            if ($this->action['start'] == $this->recur["start"]) {
                 return;
-            }else{
+            } else {
                 $items = $this->getNextOccurrence();
 
                 $props = array();
@@ -140,7 +140,7 @@ 
              * then we create first two occurrence separately and for first occurrence recurrence has ended.
              */
             if ((empty($this->action['startdate']) && empty($this->action['duedate']))
-                || ($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])){
+                || ($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])) {
 
                 $nextOccurrence = $this->getNextOccurrence();
                 $result = mapi_getprops($this->message, array(PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID));
@@ -265,18 +265,18 @@ 
 
             $copy_to_recipientTable = mapi_message_getrecipienttable($newMessage);
             $copy_to_recipientRows = mapi_table_queryallrows($copy_to_recipientTable, array(PR_ROWID));
-            foreach($copy_to_recipientRows as $recipient) {
+            foreach ($copy_to_recipientRows as $recipient) {
                 mapi_message_modifyrecipients($newMessage, MODRECIP_REMOVE, array($recipient));
             }
             mapi_message_modifyrecipients($newMessage, MODRECIP_ADD, $recipients);
 
             // Copy attachments
             $attachmentTable = mapi_message_getattachmenttable($this->message);
-            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($this->message, (int) $attach_props[PR_ATTACH_NUM]);
+                foreach ($attachments as $attach_props) {
+                    $attach_old = mapi_message_openattach($this->message, (int)$attach_props[PR_ATTACH_NUM]);
                     $attach_newResourceMsg = mapi_message_createattach($newMessage);
 
                     mapi_copyto($attach_old, array(), array(), $attach_newResourceMsg, 0);
@@ -293,7 +293,7 @@ 
             $separator = "------------\r\n";
 
             if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
-                $msgbody = $separator . $msgbody;
+                $msgbody = $separator.$msgbody;
                 $stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, STGM_TRANSACTED, 0);
                 mapi_stream_setsize($stream, strlen($msgbody));
                 mapi_stream_write($stream, $msgbody);
@@ -338,7 +338,7 @@ 
         {
             // Fix timezone object
             $this->tz = false;
-            $this->action =& $recur;
+            $this->action = & $recur;
             $dead_occurrence = isset($this->messageprops[$this->proptags['dead_occurrence']]) ? $this->messageprops[$this->proptags['dead_occurrence']] : false;
 
             if (!$dead_occurrence) {