@@ -59,8 +59,8 @@ |
||
| 59 | 59 | return array($address); |
| 60 | 60 | } |
| 61 | 61 | $ret = array(); |
| 62 | - $ret[0] = trim(substr($address, $pos+1), '>'); |
|
| 63 | - $ret[1] = substr($address, 0, $pos-1); |
|
| 62 | + $ret[0] = trim(substr($address, $pos + 1), '>'); |
|
| 63 | + $ret[1] = substr($address, 0, $pos - 1); |
|
| 64 | 64 | return $ret; |
| 65 | 65 | } |
| 66 | 66 | |
@@ -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('libs/browscap-php/src/phpbrowscap/Browscap.php'); |
| 21 | 21 | |
@@ -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 | } |
@@ -177,7 +177,7 @@ |
||
| 177 | 177 | return ob_get_clean(); |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - private function collapseEntityToArray($entity, &$array, $keyPrefix='') |
|
| 180 | + private function collapseEntityToArray($entity, &$array, $keyPrefix = '') |
|
| 181 | 181 | { |
| 182 | 182 | if(array_keys($entity) === range(0, count($entity) - 1)) |
| 183 | 183 | { |