@@ -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'); |
@@ -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,7 @@ |
||
| 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 | error_log($exception->__toString()); |
| 21 | 21 | } |
| 22 | 22 | return $response |
@@ -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 |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function setup($app) |
| 23 | 23 | { |
| 24 | - \Sentry\init(['dsn' => 'https://[email protected]/4283882' ]); |
|
| 24 | + \Sentry\init(['dsn' => 'https://[email protected]/4283882']); |
|
| 25 | 25 | return $app->any('[/]', $this); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -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 | } |
@@ -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); |
@@ -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 | } |
@@ -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 | |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * |
| 234 | 234 | * @param \stdClass $data The AuthData from the session |
| 235 | 235 | * |
| 236 | - * @return null|\Auth\LDAPUser The LDAPUser represented by this data |
|
| 236 | + * @return LDAPUser The LDAPUser represented by this data |
|
| 237 | 237 | */ |
| 238 | 238 | public function getUser($data) |
| 239 | 239 | { |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * |
| 246 | 246 | * @param string $name The Group's name |
| 247 | 247 | * |
| 248 | - * @return null|\Auth\LDAPGroup The LDAPGroup represented by the name or null if not found |
|
| 248 | + * @return null|LDAPGroup The LDAPGroup represented by the name or null if not found |
|
| 249 | 249 | */ |
| 250 | 250 | public function getGroupByName($name) |
| 251 | 251 | { |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | /** |
| 332 | - * @param boolean|\Data\Filter $filter The filter to user when reading users |
|
| 332 | + * @param \Flipside\Data\Filter $filter The filter to user when reading users |
|
| 333 | 333 | * @param boolean|array $select The fields to return |
| 334 | 334 | * @param boolean|integer $top The number of records to return |
| 335 | 335 | * @param boolean|integer $skip The number of records to skip |
@@ -8,17 +8,17 @@ discard block |
||
| 8 | 8 | * @copyright Copyright (c) 2015, Austin Artistic Reconstruction |
| 9 | 9 | * @license http://www.apache.org/licenses/ Apache 2.0 License |
| 10 | 10 | */ |
| 11 | -spl_autoload_register(function ($class) { |
|
| 11 | +spl_autoload_register(function($class) { |
|
| 12 | 12 | |
| 13 | 13 | // project-specific namespace prefix |
| 14 | 14 | $prefix = 'Flipside\\'; |
| 15 | 15 | |
| 16 | 16 | // base directory for the namespace prefix |
| 17 | - $base_dir = __DIR__ . '/'; |
|
| 17 | + $base_dir = __DIR__.'/'; |
|
| 18 | 18 | |
| 19 | 19 | // does the class use the namespace prefix? |
| 20 | 20 | $len = strlen($prefix); |
| 21 | - if (strncmp($prefix, $class, $len) !== 0) { |
|
| 21 | + if(strncmp($prefix, $class, $len) !== 0) { |
|
| 22 | 22 | // no, move to the next registered autoloader |
| 23 | 23 | return; |
| 24 | 24 | } |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | // replace the namespace prefix with the base directory, replace namespace |
| 30 | 30 | // separators with directory separators in the relative class name, append |
| 31 | 31 | // with .php |
| 32 | - $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
|
| 32 | + $file = $base_dir.str_replace('\\', '/', $relative_class).'.php'; |
|
| 33 | 33 | |
| 34 | 34 | // if the file exists, require it |
| 35 | - if (file_exists($file)) { |
|
| 35 | + if(file_exists($file)) { |
|
| 36 | 36 | require $file; |
| 37 | 37 | } |
| 38 | 38 | }); |
@@ -8,7 +8,8 @@ discard block |
||
| 8 | 8 | * @copyright Copyright (c) 2015, Austin Artistic Reconstruction |
| 9 | 9 | * @license http://www.apache.org/licenses/ Apache 2.0 License |
| 10 | 10 | */ |
| 11 | -spl_autoload_register(function ($class) { |
|
| 11 | +spl_autoload_register(function ($class) |
|
| 12 | +{ |
|
| 12 | 13 | |
| 13 | 14 | // project-specific namespace prefix |
| 14 | 15 | $prefix = 'Flipside\\'; |
@@ -18,7 +19,8 @@ discard block |
||
| 18 | 19 | |
| 19 | 20 | // does the class use the namespace prefix? |
| 20 | 21 | $len = strlen($prefix); |
| 21 | - if (strncmp($prefix, $class, $len) !== 0) { |
|
| 22 | + if (strncmp($prefix, $class, $len) !== 0) |
|
| 23 | + { |
|
| 22 | 24 | // no, move to the next registered autoloader |
| 23 | 25 | return; |
| 24 | 26 | } |
@@ -32,7 +34,8 @@ discard block |
||
| 32 | 34 | $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
| 33 | 35 | |
| 34 | 36 | // if the file exists, require it |
| 35 | - if (file_exists($file)) { |
|
| 37 | + if (file_exists($file)) |
|
| 38 | + { |
|
| 36 | 39 | require $file; |
| 37 | 40 | } |
| 38 | 41 | }); |