From 035a5b16296b30328aabb46583c6f4b93d2d2d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sat, 5 Nov 2016 23:07:14 +0100
Subject: [PATCH] Development

- Added support for cloudflare when using getIp method in Request.
- Fixed undefined variable notice in RouterBase class.
---
 src/Pecee/Http/Request.php            | 3 +++
 src/Pecee/SimpleRouter/RouterBase.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 8c1931b..49c284b 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -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);
     }
 
diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index 7177903..79603a0 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -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 */