@@ -44,8 +44,14 @@ |
||
44 | 44 | return parent::getSubject(); |
45 | 45 | } |
46 | 46 | |
47 | + /** |
|
48 | + * @return string |
|
49 | + */ |
|
47 | 50 | public abstract function getSubstituteVars(); |
48 | 51 | |
52 | + /** |
|
53 | + * @param boolean $html |
|
54 | + */ |
|
49 | 55 | protected function getRawBodyText($html) |
50 | 56 | { |
51 | 57 | if(isset($this->dbData['body'])) |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | { |
22 | 22 | if(isset($this->dbData['from'])) |
23 | 23 | { |
24 | - return $this->dbData['from'];; |
|
24 | + return $this->dbData['from']; ; |
|
25 | 25 | } |
26 | 26 | return parent::getFromAddress(); |
27 | 27 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | if(isset($this->dbData['replyTo'])) |
32 | 32 | { |
33 | - return $this->dbData['replyTo'];; |
|
33 | + return $this->dbData['replyTo']; ; |
|
34 | 34 | } |
35 | 35 | return parent::getReplyTo(); |
36 | 36 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | return $this->textBody; |
60 | 60 | } |
61 | 61 | |
62 | - protected function getBodyFromDB($html=true) |
|
62 | + protected function getBodyFromDB($html = true) |
|
63 | 63 | { |
64 | 64 | $vars = $this->getSubstituteVars(); |
65 | 65 | $rawText = $this->getRawBodyText($html); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $end = strpos($rawText, "</script>"); |
75 | 75 | if($index === 0) |
76 | 76 | { |
77 | - $rawText = substr($rawText, $end+9); |
|
77 | + $rawText = substr($rawText, $end + 9); |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 | return strtr(strip_tags($rawText), $vars); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | \Psr\Log\LogLevel::WARNING, |
13 | 13 | \Psr\Log\LogLevel::NOTICE); |
14 | 14 | |
15 | - public function __construct($params=false) |
|
15 | + public function __construct($params = false) |
|
16 | 16 | { |
17 | 17 | if(isset($params['defaultLogLevels'])) |
18 | 18 | { |
@@ -27,10 +27,10 @@ discard block |
||
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 | // check that the value can be casted to string |
32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | - $replace['{' . $key . '}'] = $val; |
|
32 | + if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | + $replace['{'.$key.'}'] = $val; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 |
@@ -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 | } |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | class PHPLog extends \Log\LogService |
5 | 5 | { |
6 | - public function __construct($params=false) |
|
6 | + public function __construct($params = false) |
|
7 | 7 | { |
8 | 8 | parent::__construct($params); |
9 | 9 | } |
@@ -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 | } |
@@ -14,8 +14,8 @@ |
||
14 | 14 | /** |
15 | 15 | * This cron script recompiles the Browscap cache |
16 | 16 | */ |
17 | -ini_set('memory_limit','-1'); // turn off memory limit for this script |
|
18 | -set_time_limit(120); // change to 2 minutes for this script |
|
17 | +ini_set('memory_limit', '-1'); // turn off memory limit for this script |
|
18 | +set_time_limit(120); // change to 2 minutes for this script |
|
19 | 19 | |
20 | 20 | require('vendor/autoload.php'); |
21 | 21 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return $this->dataTable->create($data); |
35 | 35 | } |
36 | 36 | |
37 | - public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false) |
|
37 | + public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
|
38 | 38 | { |
39 | 39 | $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params); |
40 | 40 | if($res === false) |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | return $dataTable->delete($filter); |
72 | 72 | } |
73 | 73 | |
74 | - public function count($filter=false) |
|
74 | + public function count($filter = false) |
|
75 | 75 | { |
76 | 76 | return parent::count($filter); |
77 | 77 | } |
@@ -24,6 +24,9 @@ discard block |
||
24 | 24 | } |
25 | 25 | } |
26 | 26 | |
27 | + /** |
|
28 | + * @param string $param |
|
29 | + */ |
|
27 | 30 | private function getParamFromArrayIfSet($array, $param, $default = null) |
28 | 31 | { |
29 | 32 | if(isset($array[$param])) |
@@ -52,6 +55,9 @@ discard block |
||
52 | 55 | return $response; |
53 | 56 | } |
54 | 57 | |
58 | + /** |
|
59 | + * @param string $serializer |
|
60 | + */ |
|
55 | 61 | protected function reserializeBody($response, $serializer) |
56 | 62 | { |
57 | 63 | $body = $response->getBody(); |
@@ -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 | } |
@@ -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); |