@@ -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 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
92 | 92 | $params = $this->manipulateParameters($request, $odata); |
93 | 93 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
94 | - $odata->skip, $odata->orderby, $params); |
|
94 | + $odata->skip, $odata->orderby, $params); |
|
95 | 95 | if($areas === false) |
96 | 96 | { |
97 | 97 | $areas = array(); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
134 | 134 | $filter = $this->getFilterForPrimaryKey($args['name']); |
135 | 135 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
136 | - $odata->skip, $odata->orderby); |
|
136 | + $odata->skip, $odata->orderby); |
|
137 | 137 | if(empty($areas)) |
138 | 138 | { |
139 | 139 | return $response->withStatus(404); |
@@ -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 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | if($this->user === false || $this->user === null) |
26 | 26 | { |
27 | - $this->content['body'] = ' |
|
27 | + $this->content['body'] = ' |
|
28 | 28 | <div id="content"> |
29 | 29 | <div class="row"> |
30 | 30 | <div class="col-lg-12"> |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | else if(!isset($this->content['body'])) |
38 | 38 | { |
39 | - $this->content['body'] = $this->body; |
|
39 | + $this->content['body'] = $this->body; |
|
40 | 40 | } |
41 | 41 | //Add page JS just before rednering so it is after any added by the page explicitly |
42 | 42 | $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -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); |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | |
42 | 42 | $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about'); |
43 | 43 | $this->content['header']['right']['About'] = array( |
44 | - 'url' => $this->aboutUrl, |
|
45 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
44 | + 'url' => $this->aboutUrl, |
|
45 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
46 | 46 | 'Burning Flipside' => $this->wwwUrl.'/about/event', |
47 | 47 | 'AAR, LLC' => $this->wwwUrl.'/organization/aar', |
48 | 48 | 'Privacy Policy' => $this->wwwUrl.'/about/privacy' |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $this->content['urls']['loginUrl'] = $this->loginUrl; |
59 | 59 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
60 | 60 | |
61 | - if($this->user === false || $this->user === null) |
|
61 | + if($this->user === false || $this->user === null) |
|
62 | 62 | { |
63 | 63 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
64 | 64 | { |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | { |
182 | 182 | if(!isset($this->content['notifications'])) |
183 | 183 | { |
184 | - $this->content['notifications'] = array(); |
|
184 | + $this->content['notifications'] = array(); |
|
185 | 185 | } |
186 | 186 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
187 | 187 | } |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | { |
195 | 195 | if(!isset($this->content['body'])) |
196 | 196 | { |
197 | - $this->content['body'] = $this->body; |
|
197 | + $this->content['body'] = $this->body; |
|
198 | 198 | } |
199 | 199 | //Add page JS just before rednering so it is after any added by the page explicitly |
200 | 200 | // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -17,11 +17,11 @@ |
||
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | 19 | if (php_sapi_name() !== "cli") { |
20 | - error_log($exception->__toString()); |
|
20 | + error_log($exception->__toString()); |
|
21 | 21 | } |
22 | 22 | return $response |
23 | 23 | ->withStatus(500) |
24 | 24 | ->withHeader('Content-Type', 'text/html') |
25 | 25 | ->write($exception->__toString()); |
26 | - } |
|
26 | + } |
|
27 | 27 | } |
@@ -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 |
@@ -222,15 +222,15 @@ |
||
222 | 222 | |
223 | 223 | public function php_compare($value) |
224 | 224 | { |
225 | - if(is_array($value)) |
|
226 | - { |
|
225 | + if(is_array($value)) |
|
226 | + { |
|
227 | 227 | return $this->php_compare($value[$this->var1]); |
228 | - } |
|
228 | + } |
|
229 | 229 | switch($this->op) |
230 | 230 | { |
231 | 231 | case '!=': |
232 | 232 | return $value != $this->var2; |
233 | - case '=': |
|
233 | + case '=': |
|
234 | 234 | return $value == $this->var2; |
235 | 235 | case '<': |
236 | 236 | return $value < $this->var2; |
@@ -9,33 +9,33 @@ |
||
9 | 9 | public function __construct($file) |
10 | 10 | { |
11 | 11 | $this->data = array_map('str_getcsv', file($file)); |
12 | - $titles = array_shift($this->data); |
|
13 | - $count = count($this->data); |
|
14 | - for($i = 0; $i < $count; $i++) |
|
15 | - { |
|
12 | + $titles = array_shift($this->data); |
|
13 | + $count = count($this->data); |
|
14 | + for($i = 0; $i < $count; $i++) |
|
15 | + { |
|
16 | 16 | $this->data[$i] = array_combine($titles, $this->data[$i]); |
17 | - } |
|
17 | + } |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | - $res = $filter->filter_array($res); |
|
26 | - return count($res); |
|
27 | - } |
|
28 | - return count($this->data); |
|
25 | + $res = $filter->filter_array($res); |
|
26 | + return count($res); |
|
27 | + } |
|
28 | + return count($this->data); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
32 | 32 | { |
33 | 33 | $res = $this->data; |
34 | - if($filter !== false) |
|
35 | - { |
|
34 | + if($filter !== false) |
|
35 | + { |
|
36 | 36 | $res = $filter->filter_array($res); |
37 | - } |
|
38 | - return $res; |
|
37 | + } |
|
38 | + return $res; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function create($data) |
@@ -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); |