@@ -727,7 +727,7 @@ |
||
727 | 727 | */ |
728 | 728 | private function addJSGlobals() |
729 | 729 | { |
730 | - $this->body = $this->body.'<script> |
|
730 | + $this->body = $this->body.'<script> |
|
731 | 731 | var profilesUrl = \''.$this->profilesUrl.'\' |
732 | 732 | var loginUrl = \''.$this->loginUrl.'\' |
733 | 733 | var logoutUrl = \''.$this->logoutUrl.'\' |
@@ -27,9 +27,11 @@ |
||
27 | 27 | { |
28 | 28 | // build a replacement array with braces around the context keys |
29 | 29 | $replace = array(); |
30 | - foreach ($context as $key => $val) { |
|
30 | + foreach ($context as $key => $val) |
|
31 | + { |
|
31 | 32 | // check that the value can be casted to string |
32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) |
|
34 | + { |
|
33 | 35 | $replace['{' . $key . '}'] = $val; |
34 | 36 | } |
35 | 37 | } |
@@ -40,9 +40,12 @@ discard block |
||
40 | 40 | $args = array(); |
41 | 41 | $args['RawMessage'] = array(); |
42 | 42 | $args['RawMessage']['Data'] = base64_encode($email->getRawMessage()); |
43 | - try { |
|
43 | + try |
|
44 | + { |
|
44 | 45 | return $this->ses->sendRawEmail($args); |
45 | - } catch(\Exception $e) { |
|
46 | + } |
|
47 | + catch(\Exception $e) |
|
48 | + { |
|
46 | 49 | return false; |
47 | 50 | } |
48 | 51 | } |
@@ -63,9 +66,12 @@ discard block |
||
63 | 66 | $args['Message']['Body']['Text']['Data'] = $email->getTextBody(); |
64 | 67 | $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody(); |
65 | 68 | $args['ReplyToAddresses'] = array($email->getReplyTo()); |
66 | - try { |
|
69 | + try |
|
70 | + { |
|
67 | 71 | return $this->ses->sendEmail($args); |
68 | - } catch(\Exception $e) { |
|
72 | + } |
|
73 | + catch(\Exception $e) |
|
74 | + { |
|
69 | 75 | return false; |
70 | 76 | } |
71 | 77 | } |
@@ -201,7 +201,7 @@ |
||
201 | 201 | { |
202 | 202 | if(is_object($data)) |
203 | 203 | { |
204 | - $data = get_object_vars($data); |
|
204 | + $data = get_object_vars($data); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | if(is_array($data)) |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $dataTable = $this->getDataTable(); |
76 | 76 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
77 | 77 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
78 | - $odata->skip, $odata->orderby); |
|
78 | + $odata->skip, $odata->orderby); |
|
79 | 79 | return $response->withJson($areas); |
80 | 80 | } |
81 | 81 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
102 | 102 | $filter = $this->getFilterForPrimaryKey($args['name']); |
103 | 103 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
104 | - $odata->skip, $odata->orderby); |
|
104 | + $odata->skip, $odata->orderby); |
|
105 | 105 | if(empty($areas)) |
106 | 106 | { |
107 | 107 | return $response->withStatus(404); |
@@ -13,5 +13,5 @@ |
||
13 | 13 | ->withStatus(500) |
14 | 14 | ->withHeader('Content-Type', 'text/html') |
15 | 15 | ->write(print_r($exception, true)); |
16 | - } |
|
16 | + } |
|
17 | 17 | } |
@@ -12,7 +12,9 @@ discard block |
||
12 | 12 | { |
13 | 13 | parent::__construct(); |
14 | 14 | $c = $this->getContainer(); |
15 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
15 | + $c['errorHandler'] = function($c) |
|
16 | + { |
|
17 | +return new WebErrorHandler();}; |
|
16 | 18 | $this->add(new AuthMiddleware()); |
17 | 19 | $this->add(new ODataMiddleware()); |
18 | 20 | } |
@@ -24,6 +26,8 @@ discard block |
||
24 | 26 | |
25 | 27 | public function registerAPI($uri, $api) |
26 | 28 | { |
27 | - $this->group($uri, function() use($api) {$api->setup($this);})->add(new \Http\Rest\SerializationMiddleware()); |
|
29 | + $this->group($uri, function() use($api) |
|
30 | + { |
|
31 | +$api->setup($this);})->add(new \Http\Rest\SerializationMiddleware()); |
|
28 | 32 | } |
29 | 33 | } |