@@ -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 | } |
@@ -13,7 +13,9 @@ discard block |
||
13 | 13 | $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]); |
14 | 14 | parent::__construct($settings); |
15 | 15 | $c = $this->getContainer(); |
16 | - $c['errorHandler'] = function($c) { return new WebErrorHandler();}; |
|
16 | + $c['errorHandler'] = function($c) |
|
17 | + { |
|
18 | +return new WebErrorHandler();}; |
|
17 | 19 | $this->add(new AuthMiddleware()); |
18 | 20 | $this->add(new ODataMiddleware()); |
19 | 21 | } |
@@ -25,7 +27,9 @@ discard block |
||
25 | 27 | |
26 | 28 | public function registerAPI($uri, $api) |
27 | 29 | { |
28 | - $group = $this->group($uri, function() use($api){$api->setup($this);}); |
|
30 | + $group = $this->group($uri, function() use($api) |
|
31 | + { |
|
32 | +$api->setup($this);}); |
|
29 | 33 | $group->add(new \Http\Rest\SerializationMiddleware()); |
30 | 34 | $group->add(new \Http\Rest\CORSMiddleware($this->getContainer())); |
31 | 35 | } |
@@ -42,10 +42,13 @@ discard block |
||
42 | 42 | $args = array(); |
43 | 43 | $args['RawMessage'] = array(); |
44 | 44 | $args['RawMessage']['Data'] = $email->getRawMessage(); |
45 | - try { |
|
45 | + try |
|
46 | + { |
|
46 | 47 | $res = $this->ses->sendRawEmail($args); |
47 | 48 | return $res; |
48 | - } catch(\Exception $e) { |
|
49 | + } |
|
50 | + catch(\Exception $e) |
|
51 | + { |
|
49 | 52 | return false; |
50 | 53 | } |
51 | 54 | } |
@@ -66,9 +69,12 @@ discard block |
||
66 | 69 | $args['Message']['Body']['Text']['Data'] = $email->getTextBody(); |
67 | 70 | $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody(); |
68 | 71 | $args['ReplyToAddresses'] = array($email->getReplyTo()); |
69 | - try { |
|
72 | + try |
|
73 | + { |
|
70 | 74 | return $this->ses->sendEmail($args); |
71 | - } catch(\Exception $e) { |
|
75 | + } |
|
76 | + catch(\Exception $e) |
|
77 | + { |
|
72 | 78 | return false; |
73 | 79 | } |
74 | 80 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
61 | 61 | |
62 | 62 | if($this->user === false || $this->user === null) |
63 | - { |
|
63 | + { |
|
64 | 64 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
65 | 65 | { |
66 | 66 | $this->addLink('Login', $this->loginUrl); |
@@ -16,7 +16,8 @@ |
||
16 | 16 | { |
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | - if (php_sapi_name() !== "cli") { |
|
19 | + if (php_sapi_name() !== "cli") |
|
20 | + { |
|
20 | 21 | error_log($exception->__toString()); |
21 | 22 | } |
22 | 23 | return $response |
@@ -20,7 +20,7 @@ |
||
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | 25 | $res = $filter->filter_array($res); |
26 | 26 | return count($res); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | for($i = 0; $i < $count; $i++) |
146 | 146 | { |
147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
148 | - { |
|
148 | + { |
|
149 | 149 | array_push($res, $this->children[$i]); |
150 | 150 | } |
151 | 151 | else |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | while($count >= 3) |
162 | 162 | { |
163 | 163 | if($res[1] === 'and') |
164 | - { |
|
164 | + { |
|
165 | 165 | $var1 = array_shift($res); |
166 | 166 | array_shift($res); |
167 | 167 | $var2 = array_shift($res); |
168 | 168 | $res = array_merge(array($var1 && $var2), $res); |
169 | 169 | } |
170 | - else if($res[1] === 'or') |
|
171 | - { |
|
170 | + else if($res[1] === 'or') |
|
171 | + { |
|
172 | 172 | $var1 = array_shift($res); |
173 | 173 | array_shift($res); |
174 | 174 | $var2 = array_shift($res); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | public function filter_array(&$array) |
183 | 183 | { |
184 | 184 | if(is_array($array)) |
185 | - { |
|
185 | + { |
|
186 | 186 | $res = array_filter($array, array($this, 'filterElement')); |
187 | 187 | return array_values($res); |
188 | 188 | } |
@@ -247,7 +247,8 @@ discard block |
||
247 | 247 | $stmt = $this->pdo->query($sql); |
248 | 248 | if($stmt === false) |
249 | 249 | { |
250 | - if (php_sapi_name() !== "cli") { |
|
250 | + if (php_sapi_name() !== "cli") |
|
251 | + { |
|
251 | 252 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
252 | 253 | } |
253 | 254 | return false; |
@@ -296,7 +297,8 @@ discard block |
||
296 | 297 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
297 | 298 | if($this->pdo->exec($sql) === false) |
298 | 299 | { |
299 | - if (php_sapi_name() !== "cli") { |
|
300 | + if (php_sapi_name() !== "cli") |
|
301 | + { |
|
300 | 302 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
301 | 303 | } |
302 | 304 | return false; |