@@ -376,8 +376,9 @@ discard block |
||
| 376 | 376 | |
| 377 | 377 | // Compare the timezone definitions of the client and the appointment. |
| 378 | 378 | // Further processing is only required if they don't match. |
| 379 | - if ($GLOBALS['entryid']->compareEntryIds($this->tzdef, $calendaritem['props']['tzdefstart'])) |
|
| 380 | - return; |
|
| 379 | + if ($GLOBALS['entryid']->compareEntryIds($this->tzdef, $calendaritem['props']['tzdefstart'])) { |
|
| 380 | + return; |
|
| 381 | + } |
|
| 381 | 382 | |
| 382 | 383 | if ($this->tzdefObj === false) { |
| 383 | 384 | $this->tzdefObj = $GLOBALS['entryid']->createTimezoneDefinitionObject($this->tzdef); |
@@ -389,8 +390,9 @@ discard block |
||
| 389 | 390 | // Find TZRULE_FLAG_EFFECTIVE_TZREG rule for the appointment's timezone |
| 390 | 391 | $appTzEffRuleIdx = getEffectiveTzreg($appTzDefStart['rules']); |
| 391 | 392 | |
| 392 | - if (is_null($this->tzEffRuleIdx) && !is_null($appTzEffRuleIdx)) |
|
| 393 | - return; |
|
| 393 | + if (is_null($this->tzEffRuleIdx) && !is_null($appTzEffRuleIdx)) { |
|
| 394 | + return; |
|
| 395 | + } |
|
| 394 | 396 | // first apply the bias of the appointment timezone and the bias of the browser |
| 395 | 397 | $localStart = $calendaritem['props']['startdate'] - $appTzDefStart['rules'][$appTzEffRuleIdx]['bias'] * 60 + $this->tzdefObj['rules'][$this->tzEffRuleIdx]['bias'] * 60; |
| 396 | 398 | if (isDst($appTzDefStart['rules'][$appTzEffRuleIdx], $calendaritem['props']['startdate'])) { |
@@ -2088,7 +2088,8 @@ discard block |
||
| 2088 | 2088 | if (!empty($action['props']['timezone_iana'])) { |
| 2089 | 2089 | try { |
| 2090 | 2090 | $tzdef = mapi_ianatz_to_tzdef($action['props']['timezone_iana']); |
| 2091 | - } catch (Exception $e) { |
|
| 2091 | + } |
|
| 2092 | + catch (Exception $e) { |
|
| 2092 | 2093 | } |
| 2093 | 2094 | if ($tzdef !== false) { |
| 2094 | 2095 | $action['props']['tzdefstart'] = $action['props']['tzdefend'] = bin2hex($tzdef); |
@@ -2611,8 +2612,9 @@ discard block |
||
| 2611 | 2612 | $storeprops = mapi_getprops($store, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_ENTRYID]); |
| 2612 | 2613 | $origStoreprops = mapi_getprops($origStore, [PR_ENTRYID]); |
| 2613 | 2614 | |
| 2614 | - if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID])) |
|
| 2615 | - return false; |
|
| 2615 | + if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID])) { |
|
| 2616 | + return false; |
|
| 2617 | + } |
|
| 2616 | 2618 | if (isset($storeprops[PR_IPM_SENTMAIL_ENTRYID])) { |
| 2617 | 2619 | $props[PR_SENTMAIL_ENTRYID] = $storeprops[PR_IPM_SENTMAIL_ENTRYID]; |
| 2618 | 2620 | } |
@@ -2779,8 +2781,9 @@ discard block |
||
| 2779 | 2781 | $message = $this->saveMessage($store, $entryid, $storeprops[PR_IPM_OUTBOX_ENTRYID], $props, $messageProps, $recipients, $attachments, [], $copyFromMessage, $copyAttachments, $copyRecipients, $copyInlineAttachmentsOnly, true, true, $isPlainText); |
| 2780 | 2782 | } |
| 2781 | 2783 | |
| 2782 | - if (!$message) |
|
| 2783 | - return false; |
|
| 2784 | + if (!$message) { |
|
| 2785 | + return false; |
|
| 2786 | + } |
|
| 2784 | 2787 | // Allowing to hook in just before the data sent away to be sent to the client |
| 2785 | 2788 | $GLOBALS['PluginManager']->triggerHook('server.core.operations.submitmessage', [ |
| 2786 | 2789 | 'moduleObject' => $this, |
@@ -3058,8 +3061,9 @@ discard block |
||
| 3058 | 3061 | |
| 3059 | 3062 | if (array_search(strtolower($foldername), $folderNames) !== false) { |
| 3060 | 3063 | $i = 2; |
| 3061 | - while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false) |
|
| 3062 | - ++$i; |
|
| 3064 | + while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false) { |
|
| 3065 | + ++$i; |
|
| 3066 | + } |
|
| 3063 | 3067 | $foldername .= " ($i)"; |
| 3064 | 3068 | } |
| 3065 | 3069 | |