@@ -264,7 +264,7 @@ |
||
| 264 | 264 | * @access public |
| 265 | 265 | * @return int |
| 266 | 266 | */ |
| 267 | - public function GetChangeCount() { |
|
| 267 | + public function GetChangeCount() { |
|
| 268 | 268 | if ($this->exporter) |
| 269 | 269 | return mapi_exportchanges_getchangecount($this->exporter); |
| 270 | 270 | else |
@@ -899,11 +899,11 @@ discard block |
||
| 899 | 899 | $items = $meetingrequest->findCalendarItems($goid); |
| 900 | 900 | |
| 901 | 901 | if (is_array($items)) { |
| 902 | - $newitem = mapi_msgstore_openentry($this->store, $items[0]); |
|
| 903 | - $newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY)); |
|
| 904 | - $calendarid = bin2hex($newprops[PR_SOURCE_KEY]); |
|
| 905 | - $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]); |
|
| 906 | - ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response)); |
|
| 902 | + $newitem = mapi_msgstore_openentry($this->store, $items[0]); |
|
| 903 | + $newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY)); |
|
| 904 | + $calendarid = bin2hex($newprops[PR_SOURCE_KEY]); |
|
| 905 | + $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]); |
|
| 906 | + ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response)); |
|
| 907 | 907 | } |
| 908 | 908 | |
| 909 | 909 | if ($requestid == $calendarid) |
@@ -1319,12 +1319,12 @@ discard block |
||
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | 1321 | /** |
| 1322 | - * Terminates a search for a given PID |
|
| 1323 | - * |
|
| 1324 | - * @param int $pid |
|
| 1325 | - * |
|
| 1326 | - * @return boolean |
|
| 1327 | - */ |
|
| 1322 | + * Terminates a search for a given PID |
|
| 1323 | + * |
|
| 1324 | + * @param int $pid |
|
| 1325 | + * |
|
| 1326 | + * @return boolean |
|
| 1327 | + */ |
|
| 1328 | 1328 | public function TerminateSearch($pid) { |
| 1329 | 1329 | ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->TerminateSearch(): terminating search for pid %d", $pid)); |
| 1330 | 1330 | if (!isset($this->store) || $this->store === false) { |
@@ -1829,7 +1829,6 @@ discard block |
||
| 1829 | 1829 | * @param string $type the state type |
| 1830 | 1830 | * @param string $key (opt) |
| 1831 | 1831 | * @param string $counter state counter |
| 1832 | - |
|
| 1833 | 1832 | * |
| 1834 | 1833 | * @access private |
| 1835 | 1834 | * @return MAPIMessage |
@@ -2021,7 +2020,7 @@ discard block |
||
| 2021 | 2020 | // During PING requests the operations store has to be switched constantly |
| 2022 | 2021 | // the cache prevents the same store opened several times |
| 2023 | 2022 | if (isset($this->storeCache[$user])) |
| 2024 | - return $this->storeCache[$user]; |
|
| 2023 | + return $this->storeCache[$user]; |
|
| 2025 | 2024 | |
| 2026 | 2025 | $entryid = false; |
| 2027 | 2026 | $return_public = false; |
@@ -2352,14 +2351,14 @@ discard block |
||
| 2352 | 2351 | } |
| 2353 | 2352 | } |
| 2354 | 2353 | |
| 2355 | - /** |
|
| 2356 | - * Function will create a search folder in FINDER_ROOT folder |
|
| 2357 | - * if folder exists then it will open it |
|
| 2358 | - * |
|
| 2359 | - * @see createSearchFolder($store, $openIfExists = true) function in the webaccess |
|
| 2360 | - * |
|
| 2361 | - * @return mapiFolderObject $folder created search folder |
|
| 2362 | - */ |
|
| 2354 | + /** |
|
| 2355 | + * Function will create a search folder in FINDER_ROOT folder |
|
| 2356 | + * if folder exists then it will open it |
|
| 2357 | + * |
|
| 2358 | + * @see createSearchFolder($store, $openIfExists = true) function in the webaccess |
|
| 2359 | + * |
|
| 2360 | + * @return mapiFolderObject $folder created search folder |
|
| 2361 | + */ |
|
| 2363 | 2362 | private function getSearchFolder() { |
| 2364 | 2363 | // create new or open existing search folder |
| 2365 | 2364 | $searchFolderRoot = $this->getSearchFoldersRoot($this->store); |
@@ -2377,14 +2376,14 @@ discard block |
||
| 2377 | 2376 | return false; |
| 2378 | 2377 | } |
| 2379 | 2378 | |
| 2380 | - /** |
|
| 2381 | - * Function will open FINDER_ROOT folder in root container |
|
| 2382 | - * public folder's don't have FINDER_ROOT folder |
|
| 2383 | - * |
|
| 2384 | - * @see getSearchFoldersRoot($store) function in the webaccess |
|
| 2385 | - * |
|
| 2386 | - * @return mapiFolderObject root folder for search folders |
|
| 2387 | - */ |
|
| 2379 | + /** |
|
| 2380 | + * Function will open FINDER_ROOT folder in root container |
|
| 2381 | + * public folder's don't have FINDER_ROOT folder |
|
| 2382 | + * |
|
| 2383 | + * @see getSearchFoldersRoot($store) function in the webaccess |
|
| 2384 | + * |
|
| 2385 | + * @return mapiFolderObject root folder for search folders |
|
| 2386 | + */ |
|
| 2388 | 2387 | private function getSearchFoldersRoot() { |
| 2389 | 2388 | // check if we can create search folders |
| 2390 | 2389 | $storeProps = mapi_getprops($this->store, array(PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID)); |
@@ -25,11 +25,11 @@ discard block |
||
| 25 | 25 | public static function GetEmailRestriction($timestamp) { |
| 26 | 26 | // ATTENTION: ON CHANGING THIS RESTRICTION, MAPIUtils::IsInEmailSyncInterval() also needs to be changed |
| 27 | 27 | $restriction = array ( RES_PROPERTY, |
| 28 | - array ( RELOP => RELOP_GE, |
|
| 28 | + array ( RELOP => RELOP_GE, |
|
| 29 | 29 | ULPROPTAG => PR_MESSAGE_DELIVERY_TIME, |
| 30 | 30 | VALUE => $timestamp |
| 31 | - ) |
|
| 32 | - ); |
|
| 31 | + ) |
|
| 32 | + ); |
|
| 33 | 33 | |
| 34 | 34 | return $restriction; |
| 35 | 35 | } |
@@ -56,80 +56,80 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | // ATTENTION: ON CHANGING THIS RESTRICTION, MAPIUtils::IsInCalendarSyncInterval() also needs to be changed |
| 58 | 58 | $restriction = Array(RES_OR, |
| 59 | - Array( |
|
| 60 | - // OR |
|
| 61 | - // item.end > window.start && item.start < window.end |
|
| 62 | - Array(RES_AND, |
|
| 63 | - Array( |
|
| 64 | - Array(RES_PROPERTY, |
|
| 65 | - Array(RELOP => RELOP_LE, |
|
| 66 | - ULPROPTAG => $props["starttime"], |
|
| 67 | - VALUE => $end |
|
| 68 | - ) |
|
| 69 | - ), |
|
| 70 | - Array(RES_PROPERTY, |
|
| 71 | - Array(RELOP => RELOP_GE, |
|
| 72 | - ULPROPTAG => $props["endtime"], |
|
| 73 | - VALUE => $start |
|
| 74 | - ) |
|
| 75 | - ) |
|
| 76 | - ) |
|
| 77 | - ), |
|
| 78 | - // OR |
|
| 79 | - Array(RES_OR, |
|
| 80 | - Array( |
|
| 81 | - // OR |
|
| 82 | - // (EXIST(recurrence_enddate_property) && item[isRecurring] == true && recurrence_enddate_property >= start) |
|
| 83 | - Array(RES_AND, |
|
| 84 | - Array( |
|
| 85 | - Array(RES_EXIST, |
|
| 86 | - Array(ULPROPTAG => $props["recurrenceend"], |
|
| 87 | - ) |
|
| 88 | - ), |
|
| 89 | - Array(RES_PROPERTY, |
|
| 90 | - Array(RELOP => RELOP_EQ, |
|
| 91 | - ULPROPTAG => $props["isrecurring"], |
|
| 92 | - VALUE => true |
|
| 93 | - ) |
|
| 94 | - ), |
|
| 95 | - Array(RES_PROPERTY, |
|
| 96 | - Array(RELOP => RELOP_GE, |
|
| 97 | - ULPROPTAG => $props["recurrenceend"], |
|
| 98 | - VALUE => $start |
|
| 99 | - ) |
|
| 100 | - ) |
|
| 101 | - ) |
|
| 102 | - ), |
|
| 103 | - // OR |
|
| 104 | - // (!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end) |
|
| 105 | - Array(RES_AND, |
|
| 106 | - Array( |
|
| 107 | - Array(RES_NOT, |
|
| 108 | - Array( |
|
| 109 | - Array(RES_EXIST, |
|
| 110 | - Array(ULPROPTAG => $props["recurrenceend"] |
|
| 111 | - ) |
|
| 112 | - ) |
|
| 113 | - ) |
|
| 114 | - ), |
|
| 115 | - Array(RES_PROPERTY, |
|
| 116 | - Array(RELOP => RELOP_LE, |
|
| 117 | - ULPROPTAG => $props["starttime"], |
|
| 118 | - VALUE => $end |
|
| 119 | - ) |
|
| 120 | - ), |
|
| 121 | - Array(RES_PROPERTY, |
|
| 122 | - Array(RELOP => RELOP_EQ, |
|
| 123 | - ULPROPTAG => $props["isrecurring"], |
|
| 124 | - VALUE => true |
|
| 125 | - ) |
|
| 126 | - ) |
|
| 127 | - ) |
|
| 128 | - ) |
|
| 129 | - ) |
|
| 130 | - ) // EXISTS OR |
|
| 131 | - ) |
|
| 132 | - ); // global OR |
|
| 59 | + Array( |
|
| 60 | + // OR |
|
| 61 | + // item.end > window.start && item.start < window.end |
|
| 62 | + Array(RES_AND, |
|
| 63 | + Array( |
|
| 64 | + Array(RES_PROPERTY, |
|
| 65 | + Array(RELOP => RELOP_LE, |
|
| 66 | + ULPROPTAG => $props["starttime"], |
|
| 67 | + VALUE => $end |
|
| 68 | + ) |
|
| 69 | + ), |
|
| 70 | + Array(RES_PROPERTY, |
|
| 71 | + Array(RELOP => RELOP_GE, |
|
| 72 | + ULPROPTAG => $props["endtime"], |
|
| 73 | + VALUE => $start |
|
| 74 | + ) |
|
| 75 | + ) |
|
| 76 | + ) |
|
| 77 | + ), |
|
| 78 | + // OR |
|
| 79 | + Array(RES_OR, |
|
| 80 | + Array( |
|
| 81 | + // OR |
|
| 82 | + // (EXIST(recurrence_enddate_property) && item[isRecurring] == true && recurrence_enddate_property >= start) |
|
| 83 | + Array(RES_AND, |
|
| 84 | + Array( |
|
| 85 | + Array(RES_EXIST, |
|
| 86 | + Array(ULPROPTAG => $props["recurrenceend"], |
|
| 87 | + ) |
|
| 88 | + ), |
|
| 89 | + Array(RES_PROPERTY, |
|
| 90 | + Array(RELOP => RELOP_EQ, |
|
| 91 | + ULPROPTAG => $props["isrecurring"], |
|
| 92 | + VALUE => true |
|
| 93 | + ) |
|
| 94 | + ), |
|
| 95 | + Array(RES_PROPERTY, |
|
| 96 | + Array(RELOP => RELOP_GE, |
|
| 97 | + ULPROPTAG => $props["recurrenceend"], |
|
| 98 | + VALUE => $start |
|
| 99 | + ) |
|
| 100 | + ) |
|
| 101 | + ) |
|
| 102 | + ), |
|
| 103 | + // OR |
|
| 104 | + // (!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end) |
|
| 105 | + Array(RES_AND, |
|
| 106 | + Array( |
|
| 107 | + Array(RES_NOT, |
|
| 108 | + Array( |
|
| 109 | + Array(RES_EXIST, |
|
| 110 | + Array(ULPROPTAG => $props["recurrenceend"] |
|
| 111 | + ) |
|
| 112 | + ) |
|
| 113 | + ) |
|
| 114 | + ), |
|
| 115 | + Array(RES_PROPERTY, |
|
| 116 | + Array(RELOP => RELOP_LE, |
|
| 117 | + ULPROPTAG => $props["starttime"], |
|
| 118 | + VALUE => $end |
|
| 119 | + ) |
|
| 120 | + ), |
|
| 121 | + Array(RES_PROPERTY, |
|
| 122 | + Array(RELOP => RELOP_EQ, |
|
| 123 | + ULPROPTAG => $props["isrecurring"], |
|
| 124 | + VALUE => true |
|
| 125 | + ) |
|
| 126 | + ) |
|
| 127 | + ) |
|
| 128 | + ) |
|
| 129 | + ) |
|
| 130 | + ) // EXISTS OR |
|
| 131 | + ) |
|
| 132 | + ); // global OR |
|
| 133 | 133 | |
| 134 | 134 | return $restriction; |
| 135 | 135 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | //(!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end) |
| 326 | 326 | !isset($p[$props["recurrenceend"]]) && $p[$props["isrecurring"]] == true && $p[$props["starttime"]] <= $end |
| 327 | 327 | ) |
| 328 | - ) { |
|
| 328 | + ) { |
|
| 329 | 329 | ZLog::Write(LOGLEVEL_DEBUG, "MAPIUtils->IsInCalendarSyncInterval: Message is in the synchronization interval"); |
| 330 | 330 | return true; |
| 331 | 331 | } |
@@ -374,10 +374,10 @@ discard block |
||
| 374 | 374 | |
| 375 | 375 | |
| 376 | 376 | /** |
| 377 | - * Returns the MAPI to AS mapping for email todo flags |
|
| 378 | - * |
|
| 379 | - * @return array |
|
| 380 | - */ |
|
| 377 | + * Returns the MAPI to AS mapping for email todo flags |
|
| 378 | + * |
|
| 379 | + * @return array |
|
| 380 | + */ |
|
| 381 | 381 | public static function GetMailFlagsMapping() { |
| 382 | 382 | return array ( |
| 383 | 383 | "flagstatus" => PR_FLAG_STATUS, |
@@ -398,12 +398,12 @@ discard block |
||
| 398 | 398 | |
| 399 | 399 | |
| 400 | 400 | /** |
| 401 | - * Returns email todo flags' specific MAPI properties |
|
| 402 | - * |
|
| 403 | - * @access public |
|
| 404 | - * |
|
| 405 | - * @return array |
|
| 406 | - */ |
|
| 401 | + * Returns email todo flags' specific MAPI properties |
|
| 402 | + * |
|
| 403 | + * @access public |
|
| 404 | + * |
|
| 405 | + * @return array |
|
| 406 | + */ |
|
| 407 | 407 | public static function GetMailFlagsProperties() { |
| 408 | 408 | return array( |
| 409 | 409 | "todoitemsflags" => PR_TODO_ITEM_FLAGS, |
@@ -419,12 +419,12 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | |
| 421 | 421 | /** |
| 422 | - * Returns the MAPI to AS mapping for notes |
|
| 423 | - * |
|
| 424 | - * @access public |
|
| 425 | - * |
|
| 426 | - * @return array |
|
| 427 | - */ |
|
| 422 | + * Returns the MAPI to AS mapping for notes |
|
| 423 | + * |
|
| 424 | + * @access public |
|
| 425 | + * |
|
| 426 | + * @return array |
|
| 427 | + */ |
|
| 428 | 428 | public static function GetNoteMapping() { |
| 429 | 429 | return array( |
| 430 | 430 | "categories" => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords", |
@@ -438,12 +438,12 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | |
| 440 | 440 | /** |
| 441 | - * Returns note specific MAPI properties |
|
| 442 | - * |
|
| 443 | - * @access public |
|
| 444 | - * |
|
| 445 | - * @return array |
|
| 446 | - */ |
|
| 441 | + * Returns note specific MAPI properties |
|
| 442 | + * |
|
| 443 | + * @access public |
|
| 444 | + * |
|
| 445 | + * @return array |
|
| 446 | + */ |
|
| 447 | 447 | public static function GetNoteProperties() { |
| 448 | 448 | return array( |
| 449 | 449 | "body" => PR_BODY, |
@@ -456,12 +456,12 @@ discard block |
||
| 456 | 456 | |
| 457 | 457 | |
| 458 | 458 | /** |
| 459 | - * Returns properties for sending an email |
|
| 460 | - * |
|
| 461 | - * @access public |
|
| 462 | - * |
|
| 463 | - * @return array |
|
| 464 | - */ |
|
| 459 | + * Returns properties for sending an email |
|
| 460 | + * |
|
| 461 | + * @access public |
|
| 462 | + * |
|
| 463 | + * @return array |
|
| 464 | + */ |
|
| 465 | 465 | public static function GetSendMailProperties() { |
| 466 | 466 | return array( |
| 467 | 467 | "outboxentryid" => PR_IPM_OUTBOX_ENTRYID, |
@@ -917,14 +917,14 @@ discard block |
||
| 917 | 917 | } |
| 918 | 918 | |
| 919 | 919 | /** |
| 920 | - * Reads a note object from MAPI |
|
| 921 | - * |
|
| 922 | - * @param mixed $mapimessage |
|
| 923 | - * @param ContentParameters $contentparameters |
|
| 924 | - * |
|
| 925 | - * @access private |
|
| 926 | - * @return SyncNote |
|
| 927 | - */ |
|
| 920 | + * Reads a note object from MAPI |
|
| 921 | + * |
|
| 922 | + * @param mixed $mapimessage |
|
| 923 | + * @param ContentParameters $contentparameters |
|
| 924 | + * |
|
| 925 | + * @access private |
|
| 926 | + * @return SyncNote |
|
| 927 | + */ |
|
| 928 | 928 | private function getNote($mapimessage, $contentparameters) { |
| 929 | 929 | $message = new SyncNote(); |
| 930 | 930 | |
@@ -1767,14 +1767,14 @@ discard block |
||
| 1767 | 1767 | } |
| 1768 | 1768 | |
| 1769 | 1769 | /** |
| 1770 | - * Writes a SyncNote to MAPI |
|
| 1771 | - * |
|
| 1772 | - * @param mixed $mapimessage |
|
| 1773 | - * @param SyncNote $note |
|
| 1774 | - * |
|
| 1775 | - * @access private |
|
| 1776 | - * @return boolean |
|
| 1777 | - */ |
|
| 1770 | + * Writes a SyncNote to MAPI |
|
| 1771 | + * |
|
| 1772 | + * @param mixed $mapimessage |
|
| 1773 | + * @param SyncNote $note |
|
| 1774 | + * |
|
| 1775 | + * @access private |
|
| 1776 | + * @return boolean |
|
| 1777 | + */ |
|
| 1778 | 1778 | private function setNote($mapimessage, $note) { |
| 1779 | 1779 | // Touchdown does not send categories if all are unset or there is none. |
| 1780 | 1780 | // Setting it to an empty array will unset the property in KC as well |
@@ -1956,7 +1956,7 @@ discard block |
||
| 1956 | 1956 | private function getPropsFromMAPI(&$message, $mapimessage, $mapping) { |
| 1957 | 1957 | $messageprops = $this->getProps($mapimessage, $mapping); |
| 1958 | 1958 | foreach ($mapping as $asprop => $mapiprop) { |
| 1959 | - // Get long strings via openproperty |
|
| 1959 | + // Get long strings via openproperty |
|
| 1960 | 1960 | if (isset($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))])) { |
| 1961 | 1961 | if ($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_32BIT || |
| 1962 | 1962 | $messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_64BIT) { |
@@ -2060,8 +2060,8 @@ discard block |
||
| 2060 | 2060 | */ |
| 2061 | 2061 | private function getTZFromMAPIBlob($data) { |
| 2062 | 2062 | $unpacked = unpack("lbias/lstdbias/ldstbias/" . |
| 2063 | - "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" . |
|
| 2064 | - "vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis", $data); |
|
| 2063 | + "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" . |
|
| 2064 | + "vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis", $data); |
|
| 2065 | 2065 | return $unpacked; |
| 2066 | 2066 | } |
| 2067 | 2067 | |
@@ -2095,9 +2095,9 @@ discard block |
||
| 2095 | 2095 | */ |
| 2096 | 2096 | private function getMAPIBlobFromTZ($tz) { |
| 2097 | 2097 | $packed = pack("lll" . "vvvvvvvvv" . "vvvvvvvvv", |
| 2098 | - $tz["bias"], $tz["stdbias"], $tz["dstbias"], |
|
| 2099 | - 0, 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"], |
|
| 2100 | - 0, 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"]); |
|
| 2098 | + $tz["bias"], $tz["stdbias"], $tz["dstbias"], |
|
| 2099 | + 0, 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"], |
|
| 2100 | + 0, 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"]); |
|
| 2101 | 2101 | |
| 2102 | 2102 | return $packed; |
| 2103 | 2103 | } |
@@ -2162,16 +2162,16 @@ discard block |
||
| 2162 | 2162 | |
| 2163 | 2163 | if($start < $end) { |
| 2164 | 2164 | // northern hemisphere (july = dst) |
| 2165 | - if($localtime >= $start && $localtime < $end) |
|
| 2166 | - $dst = true; |
|
| 2167 | - else |
|
| 2168 | - $dst = false; |
|
| 2165 | + if($localtime >= $start && $localtime < $end) |
|
| 2166 | + $dst = true; |
|
| 2167 | + else |
|
| 2168 | + $dst = false; |
|
| 2169 | 2169 | } else { |
| 2170 | 2170 | // southern hemisphere (january = dst) |
| 2171 | - if($localtime >= $end && $localtime < $start) |
|
| 2172 | - $dst = false; |
|
| 2173 | - else |
|
| 2174 | - $dst = true; |
|
| 2171 | + if($localtime >= $end && $localtime < $start) |
|
| 2172 | + $dst = false; |
|
| 2173 | + else |
|
| 2174 | + $dst = true; |
|
| 2175 | 2175 | } |
| 2176 | 2176 | |
| 2177 | 2177 | return $dst; |
@@ -2349,7 +2349,7 @@ discard block |
||
| 2349 | 2349 | * @access private |
| 2350 | 2350 | * @return |
| 2351 | 2351 | */ |
| 2352 | - private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) { |
|
| 2352 | + private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) { |
|
| 2353 | 2353 | if (isset($city)) $props[$properties[$type."city"]] = $city = u2w($city); |
| 2354 | 2354 | |
| 2355 | 2355 | if (isset($country)) $props[$properties[$type."country"]] = $country = u2w($country); |
@@ -2718,14 +2718,14 @@ discard block |
||
| 2718 | 2718 | } |
| 2719 | 2719 | |
| 2720 | 2720 | /** |
| 2721 | - * Sets properties for an email message. |
|
| 2722 | - * |
|
| 2723 | - * @param mixed $mapimessage |
|
| 2724 | - * @param SyncMail $message |
|
| 2725 | - * |
|
| 2726 | - * @access private |
|
| 2727 | - * @return void |
|
| 2728 | - */ |
|
| 2721 | + * Sets properties for an email message. |
|
| 2722 | + * |
|
| 2723 | + * @param mixed $mapimessage |
|
| 2724 | + * @param SyncMail $message |
|
| 2725 | + * |
|
| 2726 | + * @access private |
|
| 2727 | + * @return void |
|
| 2728 | + */ |
|
| 2729 | 2729 | private function setFlag($mapimessage, &$message){ |
| 2730 | 2730 | // do nothing if protocol version is lower than 12.0 as flags haven't been defined before |
| 2731 | 2731 | if (Request::GetProtocolVersion() < 12.0 ) return; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | return $this->position; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - /** |
|
| 122 | + /** |
|
| 123 | 123 | * Indicates if 'end of file' is reached |
| 124 | 124 | * |
| 125 | 125 | * @access public |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | ); |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - /** |
|
| 162 | + /** |
|
| 163 | 163 | * Instantiates a MAPIStreamWrapper |
| 164 | 164 | * |
| 165 | 165 | * @param mapistream $mapistream The stream to be wrapped |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | * @access public |
| 169 | 169 | * @return MAPIStreamWrapper |
| 170 | 170 | */ |
| 171 | - static public function Open($mapistream, $truncatehtmlsafe = false) { |
|
| 171 | + static public function Open($mapistream, $truncatehtmlsafe = false) { |
|
| 172 | 172 | $context = stream_context_create(array(self::PROTOCOL => array('stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe))); |
| 173 | 173 | return fopen(self::PROTOCOL . "://",'r', false, $context); |
| 174 | 174 | } |
@@ -184,7 +184,7 @@ |
||
| 184 | 184 | self::$encoder->endTag(); |
| 185 | 185 | |
| 186 | 186 | self::$encoder->startTag(SYNC_PROVISION_POLICYKEY); |
| 187 | - self::$encoder->content($policykey); |
|
| 187 | + self::$encoder->content($policykey); |
|
| 188 | 188 | self::$encoder->endTag(); |
| 189 | 189 | |
| 190 | 190 | if ($phase2 && $policystatus === SYNC_PROVISION_POLICYSTATUS_SUCCESS) { |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | $status = SYNC_FSSTATUS_SYNCKEYERROR; |
| 122 | 122 | } |
| 123 | 123 | catch (StatusException $stex) { |
| 124 | - $status = $stex->getCode(); |
|
| 124 | + $status = $stex->getCode(); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | // set $newsynckey in case of an error |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | // the hierarchyCache should now fully be initialized - check for changes in the additional folders |
| 64 | 64 | $changesMem->Config(ZPush::GetAdditionalSyncFolders(false), ChangesMemoryWrapper::SYNCHRONIZING); |
| 65 | 65 | |
| 66 | - // reset to default store in backend |
|
| 66 | + // reset to default store in backend |
|
| 67 | 67 | self::$backend->Setup(false); |
| 68 | 68 | |
| 69 | 69 | // process incoming changes |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | catch (StatusException $stex) { |
| 120 | - $status = $stex->getCode(); |
|
| 120 | + $status = $stex->getCode(); |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |