@@ -24,8 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | // TODO execute $data->Check() to see if SyncObject is valid |
| 27 | - } |
|
| 28 | - catch (StatusException $ex) { |
|
| 27 | + } catch (StatusException $ex) { |
|
| 29 | 28 | return false; |
| 30 | 29 | } |
| 31 | 30 | |
@@ -98,8 +98,7 @@ |
||
| 98 | 98 | if (!$handler->Handle(Request::GetCommandCode())) { |
| 99 | 99 | throw new WBXMLException(sprintf("Unknown error in %s->Handle()", get_class($handler))); |
| 100 | 100 | } |
| 101 | - } |
|
| 102 | - catch (Exception $ex) { |
|
| 101 | + } catch (Exception $ex) { |
|
| 103 | 102 | // Log 10 KB of the WBXML data |
| 104 | 103 | SLog::Write(LOGLEVEL_FATAL, "WBXML 10K debug data: " . Request::GetInputAsBase64(10240), false); |
| 105 | 104 | |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | } |
| 41 | 41 | self::$topCollector->AnnounceInformation(sprintf("Streamed %d KB attachment", round($l / 1024)), true); |
| 42 | 42 | SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleGetAttachment(): attachment with %d KB sent to mobile", round($l / 1024))); |
| 43 | - } |
|
| 44 | - catch (StatusException $s) { |
|
| 43 | + } catch (StatusException $s) { |
|
| 45 | 44 | // StatusException already logged so we just need to pass it upwards to send a HTTP error |
| 46 | 45 | throw new HTTPReturnCodeException($s->getMessage(), HTTP_CODE_500, null, LOGLEVEL_DEBUG); |
| 47 | 46 | } |
@@ -81,8 +81,7 @@ |
||
| 81 | 81 | if ($calendarid === false) { |
| 82 | 82 | throw new StatusException("HandleMeetingResponse() not possible", SYNC_MEETRESPSTATUS_SERVERERROR); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - catch (StatusException $stex) { |
|
| 84 | + } catch (StatusException $stex) { |
|
| 86 | 85 | $status = $stex->getCode(); |
| 87 | 86 | } |
| 88 | 87 | |
@@ -48,8 +48,7 @@ discard block |
||
| 48 | 48 | public function getKey($key) { |
| 49 | 49 | try { |
| 50 | 50 | return $this->redisObj->get($key); |
| 51 | - } |
|
| 52 | - catch (Exception $e) { |
|
| 51 | + } catch (Exception $e) { |
|
| 53 | 52 | SLog::Write(LOGLEVEL_ERROR, sprintf("%s->getKey(): %s", get_class($this), $e->getMessage())); |
| 54 | 53 | } |
| 55 | 54 | } |
@@ -61,8 +60,7 @@ discard block |
||
| 61 | 60 | } |
| 62 | 61 | |
| 63 | 62 | return $this->redisObj->set($key, $value); |
| 64 | - } |
|
| 65 | - catch (Exception $e) { |
|
| 63 | + } catch (Exception $e) { |
|
| 66 | 64 | SLog::Write(LOGLEVEL_ERROR, sprintf("%s->setKey(): %s", get_class($this), $e->getMessage())); |
| 67 | 65 | } |
| 68 | 66 | } |
@@ -70,8 +68,7 @@ discard block |
||
| 70 | 68 | public function delKey($key) { |
| 71 | 69 | try { |
| 72 | 70 | return $this->redisObj->del($key); |
| 73 | - } |
|
| 74 | - catch (Exception $e) { |
|
| 71 | + } catch (Exception $e) { |
|
| 75 | 72 | SLog::Write(LOGLEVEL_ERROR, sprintf("%s->delKey(): %s", get_class($this), $e->getMessage())); |
| 76 | 73 | } |
| 77 | 74 | } |
@@ -1762,8 +1762,7 @@ discard block |
||
| 1762 | 1762 | if (isset($inboxprops[$prop])) { |
| 1763 | 1763 | return $inboxprops[$prop]; |
| 1764 | 1764 | } |
| 1765 | - } |
|
| 1766 | - catch (MAPIException $e) { |
|
| 1765 | + } catch (MAPIException $e) { |
|
| 1767 | 1766 | // public store doesn't support this method |
| 1768 | 1767 | if ($e->getCode() == MAPI_E_NO_SUPPORT) { |
| 1769 | 1768 | // don't propagate this error to parent handlers, if store doesn't support it |
@@ -1853,8 +1852,7 @@ discard block |
||
| 1853 | 1852 | if (($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) { |
| 1854 | 1853 | $accessToFolder = true; |
| 1855 | 1854 | } |
| 1856 | - } |
|
| 1857 | - catch (MAPIException $e) { |
|
| 1855 | + } catch (MAPIException $e) { |
|
| 1858 | 1856 | // we don't have rights to open folder, so return false |
| 1859 | 1857 | if ($e->getCode() == MAPI_E_NO_ACCESS) { |
| 1860 | 1858 | return $accessToFolder; |
@@ -1922,8 +1920,7 @@ discard block |
||
| 1922 | 1920 | |
| 1923 | 1921 | try { |
| 1924 | 1922 | $mailuser = mapi_ab_openentry($ab, $ownerentryid); |
| 1925 | - } |
|
| 1926 | - catch (MAPIException $e) { |
|
| 1923 | + } catch (MAPIException $e) { |
|
| 1927 | 1924 | return; |
| 1928 | 1925 | } |
| 1929 | 1926 | |
@@ -2526,8 +2523,7 @@ discard block |
||
| 2526 | 2523 | if ($accessToFolder) { |
| 2527 | 2524 | $calFolder = mapi_msgstore_openentry($userStore, $userRootProps[PR_IPM_APPOINTMENT_ENTRYID]); |
| 2528 | 2525 | } |
| 2529 | - } |
|
| 2530 | - catch (MAPIException $e) { |
|
| 2526 | + } catch (MAPIException $e) { |
|
| 2531 | 2527 | $e->setHandled(); |
| 2532 | 2528 | $this->errorSetResource = 1; // No access |
| 2533 | 2529 | } |
@@ -269,8 +269,7 @@ |
||
| 269 | 269 | // Get the FB interface |
| 270 | 270 | try { |
| 271 | 271 | $fbsupport = mapi_freebusysupport_open($this->session, $this->store); |
| 272 | - } |
|
| 273 | - catch (MAPIException $e) { |
|
| 272 | + } catch (MAPIException $e) { |
|
| 274 | 273 | if ($e->getCode() == MAPI_E_NOT_FOUND) { |
| 275 | 274 | $e->setHandled(); |
| 276 | 275 | SLog::Write(LOGLEVEL_WARN, "Error in opening freebusysupport object."); |
@@ -1011,8 +1011,7 @@ |
||
| 1011 | 1011 | try { |
| 1012 | 1012 | $attach = mapi_message_openattach($message, $row[PR_ATTACH_NUM]); |
| 1013 | 1013 | $task = mapi_attach_openobj($attach); |
| 1014 | - } |
|
| 1015 | - catch (MAPIException $e) { |
|
| 1014 | + } catch (MAPIException $e) { |
|
| 1016 | 1015 | continue; |
| 1017 | 1016 | } |
| 1018 | 1017 | |
@@ -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); |