@@ -19,7 +19,7 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | protected function main() |
| 21 | 21 | { |
| 22 | - $path = $this->getSiteConfiguration()->getFilePath() . '/team.json'; |
|
| 22 | + $path = $this->getSiteConfiguration()->getFilePath().'/team.json'; |
|
| 23 | 23 | $json = file_get_contents($path); |
| 24 | 24 | |
| 25 | 25 | $teamData = json_decode($json, true); |
@@ -48,8 +48,8 @@ |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | //Look for and detect IPv4/IPv6 addresses in comment text, and warn the commenter. |
| 51 | - $ipv4Regex = '/\b' . RegexConstants::IPV4 . '\b/'; |
|
| 52 | - $ipv6Regex = '/\b' . RegexConstants::IPV6 . '\b/'; |
|
| 51 | + $ipv4Regex = '/\b'.RegexConstants::IPV4.'\b/'; |
|
| 52 | + $ipv6Regex = '/\b'.RegexConstants::IPV6.'\b/'; |
|
| 53 | 53 | |
| 54 | 54 | $overridePolicy = WebRequest::postBoolean('privpol-check-override'); |
| 55 | 55 | |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | } |
| 51 | 51 | catch (PDOException $ex) { |
| 52 | 52 | // wrap around any potential stack traces which may include passwords |
| 53 | - throw new EnvironmentException("Error connecting to database '$connectionName': " . $ex->getMessage()); |
|
| 53 | + throw new EnvironmentException("Error connecting to database '$connectionName': ".$ex->getMessage()); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $databaseObject->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | $errorId = sha1($state); |
| 59 | 59 | |
| 60 | 60 | // Save the error for later analysis |
| 61 | - file_put_contents($siteConfiguration->getErrorLog() . '/' . $errorId . '.log', $state); |
|
| 61 | + file_put_contents($siteConfiguration->getErrorLog().'/'.$errorId.'.log', $state); |
|
| 62 | 62 | |
| 63 | 63 | // clear and discard any content that's been saved to the output buffer |
| 64 | 64 | if (ob_get_level() > 0) { |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | // username can't contain #@/<>[]|{} |
| 123 | - if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) { |
|
| 123 | + if (preg_match("/[".preg_quote("#@/<>[]|{}", "/")."]/", $this->request->getName()) === 1) { |
|
| 124 | 124 | $errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR); |
| 125 | 125 | } |
| 126 | 126 | |
@@ -358,7 +358,7 @@ |
||
| 358 | 358 | $routeMap = $this->routePathSegments($classSegment, $requestedAction); |
| 359 | 359 | |
| 360 | 360 | if ($routeMap[0] === Page404::class) { |
| 361 | - $routeMap = $this->routeSinglePathSegment($classSegment . '/' . $requestedAction); |
|
| 361 | + $routeMap = $this->routeSinglePathSegment($classSegment.'/'.$requestedAction); |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | return $routeMap; |
@@ -25,14 +25,14 @@ |
||
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | $paths = array( |
| 28 | - __DIR__ . '/' . $class . ".php", |
|
| 29 | - __DIR__ . '/DataObjects/' . $class . ".php", |
|
| 30 | - __DIR__ . '/Providers/' . $class . ".php", |
|
| 31 | - __DIR__ . '/Providers/Interfaces/' . $class . ".php", |
|
| 32 | - __DIR__ . '/Validation/' . $class . ".php", |
|
| 33 | - __DIR__ . '/Helpers/' . $class . ".php", |
|
| 34 | - __DIR__ . '/Helpers/Interfaces/' . $class . ".php", |
|
| 35 | - __DIR__ . '/' . $class . ".php", |
|
| 28 | + __DIR__.'/'.$class.".php", |
|
| 29 | + __DIR__.'/DataObjects/'.$class.".php", |
|
| 30 | + __DIR__.'/Providers/'.$class.".php", |
|
| 31 | + __DIR__.'/Providers/Interfaces/'.$class.".php", |
|
| 32 | + __DIR__.'/Validation/'.$class.".php", |
|
| 33 | + __DIR__.'/Helpers/'.$class.".php", |
|
| 34 | + __DIR__.'/Helpers/Interfaces/'.$class.".php", |
|
| 35 | + __DIR__.'/'.$class.".php", |
|
| 36 | 36 | ); |
| 37 | 37 | |
| 38 | 38 | foreach ($paths as $file) { |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | return ucfirst($string); |
| 81 | 81 | } |
| 82 | 82 | else { |
| 83 | - return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1); |
|
| 83 | + return mb_strtoupper(mb_substr($string, 0, 1)).mb_substr($string, 1); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -114,13 +114,13 @@ |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // match a regex of an CIDR range: |
| 117 | - $ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@'; |
|
| 117 | + $ipcidr = '@'.RegexConstants::IPV4.RegexConstants::IPV4_CIDR.'@'; |
|
| 118 | 118 | if (preg_match($ipcidr, $line) === 1) { |
| 119 | 119 | $iprange[] = $line; |
| 120 | 120 | continue; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $ipnoncidr = '@' . RegexConstants::IPV4 . '@'; |
|
| 123 | + $ipnoncidr = '@'.RegexConstants::IPV4.'@'; |
|
| 124 | 124 | if (preg_match($ipnoncidr, $line) === 1) { |
| 125 | 125 | $ip[] = $line; |
| 126 | 126 | continue; |