geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 08:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2016-11-05 23:09:19 +01:00
committed by GitHub
parent 9fed6ffb3f 035a5b1629
commit 4c8ed5bb3d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Request.php
+3
View File
@@ -96,6 +96,9 @@ class Request {
* @return string * @return string
*/ */
public function getIp() { 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); 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);
} }
src/Pecee/SimpleRouter/RouterBase.php
+2 -2
View File
@@ -113,6 +113,8 @@ class RouterBase {
$originalUri = $this->request->getUri(); $originalUri = $this->request->getUri();
$routeNotAllowed = false;
try { try {
// Initialize boot-managers // Initialize boot-managers
@@ -137,8 +139,6 @@ class RouterBase {
} }
} }
$routeNotAllowed = false;
$max = count($this->controllerUrlMap); $max = count($this->controllerUrlMap);
/* @var $route RouterEntry */ /* @var $route RouterEntry */