@@ -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); |