@@ -284,7 +284,7 @@ |
||
| 284 | 284 | $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]); |
| 285 | 285 | |
| 286 | 286 | foreach ($attachments as $attach_props) { |
| 287 | - $attach_old = mapi_message_openattach($this->message, (int) $attach_props[PR_ATTACH_NUM]); |
|
| 287 | + $attach_old = mapi_message_openattach($this->message, (int)$attach_props[PR_ATTACH_NUM]); |
|
| 288 | 288 | $attach_newResourceMsg = mapi_message_createattach($newMessage); |
| 289 | 289 | |
| 290 | 290 | mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0); |
@@ -57,8 +57,7 @@ |
||
| 57 | 57 | else { |
| 58 | 58 | echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n"; |
| 59 | 59 | } |
| 60 | - } |
|
| 61 | - catch (GSyncException $zpe) { |
|
| 60 | + } catch (GSyncException $zpe) { |
|
| 62 | 61 | fwrite(STDERR, get_class($zpe) . ": " . $zpe->getMessage() . "\n"); |
| 63 | 62 | |
| 64 | 63 | exit(1); |
@@ -49,11 +49,9 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | // there are no SyncParameters for the hierarchy, but we use it to save the latest synckeys |
| 51 | 51 | $spa = self::$deviceManager->GetStateManager()->GetSynchedFolderState(false); |
| 52 | - } |
|
| 53 | - catch (StateNotFoundException $snfex) { |
|
| 52 | + } catch (StateNotFoundException $snfex) { |
|
| 54 | 53 | $status = SYNC_FSSTATUS_SYNCKEYERROR; |
| 55 | - } |
|
| 56 | - catch (StateInvalidException $sive) { |
|
| 54 | + } catch (StateInvalidException $sive) { |
|
| 57 | 55 | $status = SYNC_FSSTATUS_SYNCKEYERROR; |
| 58 | 56 | } |
| 59 | 57 | |
@@ -121,8 +119,7 @@ discard block |
||
| 121 | 119 | SLog::Write(LOGLEVEL_WARN, sprintf("Request->HandleFolderSync(): ignoring incoming folderchange for folder '%s' as status indicates problem.", $folder->displayname)); |
| 122 | 120 | self::$topCollector->AnnounceInformation("Incoming change ignored", true); |
| 123 | 121 | } |
| 124 | - } |
|
| 125 | - catch (StatusException $stex) { |
|
| 122 | + } catch (StatusException $stex) { |
|
| 126 | 123 | $status = $stex->getCode(); |
| 127 | 124 | } |
| 128 | 125 | } |
@@ -199,8 +196,7 @@ discard block |
||
| 199 | 196 | |
| 200 | 197 | // get the new state from the backend |
| 201 | 198 | $newsyncstate = (isset($exporter)) ? $exporter->GetState() : ""; |
| 202 | - } |
|
| 203 | - catch (StatusException $stex) { |
|
| 199 | + } catch (StatusException $stex) { |
|
| 204 | 200 | if ($stex->getCode() == SYNC_FSSTATUS_CODEUNKNOWN) { |
| 205 | 201 | $status = SYNC_FSSTATUS_SYNCKEYERROR; |
| 206 | 202 | } |
@@ -130,11 +130,9 @@ discard block |
||
| 130 | 130 | if (self::$deviceManager->GetFolderTypeFromCacheById($serverid) != SYNC_FOLDER_TYPE_UNKNOWN && !self::$backend->Setup(GSync::GetAdditionalSyncFolderStore((($parentBackendId != false) ? $parentBackendId : $backendid)))) { |
| 131 | 131 | throw new StatusException(sprintf("HandleFolderChange() could not Setup() the backend for folder id '%s'", (($parentBackendId != false) ? $parentBackendId : $backendid)), SYNC_FSSTATUS_SERVERERROR); |
| 132 | 132 | } |
| 133 | - } |
|
| 134 | - catch (StateNotFoundException $snfex) { |
|
| 133 | + } catch (StateNotFoundException $snfex) { |
|
| 135 | 134 | $status = SYNC_FSSTATUS_SYNCKEYERROR; |
| 136 | - } |
|
| 137 | - catch (StatusException $stex) { |
|
| 135 | + } catch (StatusException $stex) { |
|
| 138 | 136 | $status = $stex->getCode(); |
| 139 | 137 | } |
| 140 | 138 | |
@@ -174,8 +172,7 @@ discard block |
||
| 174 | 172 | // delete folder |
| 175 | 173 | $changesMem->ImportFolderDeletion($folder); |
| 176 | 174 | } |
| 177 | - } |
|
| 178 | - catch (StatusException $stex) { |
|
| 175 | + } catch (StatusException $stex) { |
|
| 179 | 176 | $status = $stex->getCode(); |
| 180 | 177 | } |
| 181 | 178 | } |
@@ -92,8 +92,7 @@ |
||
| 92 | 92 | |
| 93 | 93 | $result = $importer->ImportMessageMove($move["srcmsgid"], self::$deviceManager->GetBackendIdForFolderId($move["dstfldid"])); |
| 94 | 94 | // We discard the standard importer state for now. |
| 95 | - } |
|
| 96 | - catch (StatusException $stex) { |
|
| 95 | + } catch (StatusException $stex) { |
|
| 97 | 96 | if ($stex->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) { // same as SYNC_FSSTATUS_CODEUNKNOWN |
| 98 | 97 | $status = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID; |
| 99 | 98 | } |
@@ -30,8 +30,7 @@ discard block |
||
| 30 | 30 | // Load all collections - do load states, check permissions and allow unconfirmed states |
| 31 | 31 | try { |
| 32 | 32 | $sc->LoadAllCollections(true, true, true, true, false); |
| 33 | - } |
|
| 34 | - catch (StateInvalidException $siex) { |
|
| 33 | + } catch (StateInvalidException $siex) { |
|
| 35 | 34 | // if no params are present, indicate to send params, else do hierarchy sync |
| 36 | 35 | if (!$params_present) { |
| 37 | 36 | $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS; |
@@ -49,8 +48,7 @@ discard block |
||
| 49 | 48 | |
| 50 | 49 | self::$topCollector->AnnounceInformation("StateInvalidException: force sync", true); |
| 51 | 50 | } |
| 52 | - } |
|
| 53 | - catch (StatusException $stex) { |
|
| 51 | + } catch (StatusException $stex) { |
|
| 54 | 52 | $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED; |
| 55 | 53 | self::$topCollector->AnnounceInformation("StatusException: require HierarchySync", true); |
| 56 | 54 | } |
@@ -103,8 +101,7 @@ discard block |
||
| 103 | 101 | |
| 104 | 102 | continue; |
| 105 | 103 | } |
| 106 | - } |
|
| 107 | - catch (NoHierarchyCacheAvailableException $nhca) { |
|
| 104 | + } catch (NoHierarchyCacheAvailableException $nhca) { |
|
| 108 | 105 | SLog::Write(LOGLEVEL_INFO, sprintf("HandlePing(): unknown collection '%s', triggering HierarchySync", $folderid)); |
| 109 | 106 | $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED; |
| 110 | 107 | } |
@@ -165,8 +162,7 @@ discard block |
||
| 165 | 162 | self::$deviceManager->DoAutomaticASDeviceSaving(false); |
| 166 | 163 | $foundchanges = $sc->CheckForChanges($sc->GetLifetime(), $interval, true); |
| 167 | 164 | } |
| 168 | - } |
|
| 169 | - catch (StatusException $ste) { |
|
| 165 | + } catch (StatusException $ste) { |
|
| 170 | 166 | switch ($ste->getCode()) { |
| 171 | 167 | case SyncCollections::ERROR_NO_COLLECTIONS: |
| 172 | 168 | $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS; |
@@ -352,8 +352,7 @@ |
||
| 352 | 352 | $cpo->SetSearchFolderid($backendFolderId); |
| 353 | 353 | $rows = $searchprovider->GetMailboxSearchResults($cpo); |
| 354 | 354 | } |
| 355 | - } |
|
| 356 | - catch (StatusException $stex) { |
|
| 355 | + } catch (StatusException $stex) { |
|
| 357 | 356 | $storestatus = $stex->getCode(); |
| 358 | 357 | } |
| 359 | 358 | } |
@@ -108,8 +108,7 @@ |
||
| 108 | 108 | |
| 109 | 109 | try { |
| 110 | 110 | $status = self::$backend->SendMail($sm); |
| 111 | - } |
|
| 112 | - catch (StatusException $se) { |
|
| 111 | + } catch (StatusException $se) { |
|
| 113 | 112 | $status = $se->getCode(); |
| 114 | 113 | $statusMessage = $se->getMessage(); |
| 115 | 114 | } |
@@ -117,8 +117,7 @@ |
||
| 117 | 117 | return SYNC_E_IGNORE; |
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | - } |
|
| 121 | - catch (SyncObjectBrokenException $mbe) { |
|
| 120 | + } catch (SyncObjectBrokenException $mbe) { |
|
| 122 | 121 | $brokenSO = $mbe->GetSyncObject(); |
| 123 | 122 | if (!$brokenSO) { |
| 124 | 123 | SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available")); |