Development

- Added support for cloudflare when using getIp method in Request.
- Fixed undefined variable notice in RouterBase class.
This commit is contained in:
Simon Sessingø
2016-11-05 23:07:14 +01:00
parent 832aff0358
commit 035a5b1629
2 changed files with 5 additions and 2 deletions

View File

@@ -96,6 +96,9 @@ class Request {
* @return string
*/
public function getIp() {
if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
return $_SERVER['HTTP_CF_CONNECTING_IP'];
}
return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null);
}

View File

@@ -113,6 +113,8 @@ class RouterBase {
$originalUri = $this->request->getUri();
$routeNotAllowed = false;
try {
// Initialize boot-managers
@@ -137,8 +139,6 @@ class RouterBase {
}
}
$routeNotAllowed = false;
$max = count($this->controllerUrlMap);
/* @var $route RouterEntry */