| @@ -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 | |
| @@ -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 | } | 
| @@ -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 | |
| @@ -13,7 +13,7 @@ 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) { return new WebErrorHandler(); }; | |
| 17 | 17 | $this->add(new AuthMiddleware()); | 
| 18 | 18 | $this->add(new ODataMiddleware()); | 
| 19 | 19 | } | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | |
| 26 | 26 | public function registerAPI($uri, $api) | 
| 27 | 27 |      { | 
| 28 | -        $group = $this->group($uri, function() use($api){$api->setup($this);}); | |
| 28 | +        $group = $this->group($uri, function() use($api){$api->setup($this); }); | |
| 29 | 29 | $group->add(new \Http\Rest\SerializationMiddleware()); | 
| 30 | 30 | $group->add(new \Http\Rest\CORSMiddleware($this->getContainer())); | 
| 31 | 31 | } | 
| @@ -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 | } | 
| @@ -89,7 +89,7 @@ | ||
| 89 | 89 |              { | 
| 90 | 90 | $this->addValueByColName($res[0], $tmp, $colName, $row[$colName]); | 
| 91 | 91 | } | 
| 92 | - $tmp = $tmp+array_fill_keys(range(0,max(array_keys($tmp))),false); | |
| 92 | + $tmp = $tmp + array_fill_keys(range(0, max(array_keys($tmp))), false); | |
| 93 | 93 | ksort($tmp); | 
| 94 | 94 | $res[] = $tmp; | 
| 95 | 95 | } | 
| @@ -89,7 +89,7 @@ discard block | ||
| 89 | 89 | $this->content['css'] = array($uri); | 
| 90 | 90 | return; | 
| 91 | 91 | } | 
| 92 | - array_push($this->content['css'],$uri); | |
| 92 | + array_push($this->content['css'], $uri); | |
| 93 | 93 | } | 
| 94 | 94 | |
| 95 | 95 | /** | 
| @@ -104,7 +104,7 @@ discard block | ||
| 104 | 104 | $this->content['js'] = array($uri); | 
| 105 | 105 | return; | 
| 106 | 106 | } | 
| 107 | - array_push($this->content['js'],$uri); | |
| 107 | + array_push($this->content['js'], $uri); | |
| 108 | 108 | } | 
| 109 | 109 | |
| 110 | 110 | /** | 
| @@ -146,7 +146,7 @@ discard block | ||
| 146 | 146 |          { | 
| 147 | 147 | $data['menu'] = $submenu; | 
| 148 | 148 | } | 
| 149 | - $this->content['header']['right'] = array($name => $data)+$this->content['header']['right']; | |
| 149 | + $this->content['header']['right'] = array($name => $data) + $this->content['header']['right']; | |
| 150 | 150 | } | 
| 151 | 151 | |
| 152 | 152 | /** Notification that is green for success */ | 
| @@ -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); |