Merge pull request #120 from skipperbent/development

Development
2026-06-28 22:19:19 +00:00 · 2016-11-05 23:09:19 +01:00 · 2016-11-05 23:07:14 +01:00 · 2016-10-28 07:41:21 +02:00 · 2016-10-28 07:40:51 +02:00
2 changed files with 6 additions and 3 deletions
@@ -96,7 +96,10 @@ class Request {
     * @return string
     */
    public function getIp() {
-        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
+        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);
    }

    /**
@@ -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 */
Author	SHA1	Message	Date
Simon Sessingø	4c8ed5bb3d	Merge pull request #120 from skipperbent/development Development	2016-11-05 23:09:19 +01:00
Simon Sessingø	035a5b1629	Development - Added support for cloudflare when using getIp method in Request. - Fixed undefined variable notice in RouterBase class.	2016-11-05 23:07:14 +01:00
Simon Sessingø	9fed6ffb3f	Merge pull request #119 from skipperbent/development Optimised for cli-usage	2016-10-28 07:41:21 +02:00
Simon Sessingø	832aff0358	Optimised for cli-usage	2016-10-28 07:40:51 +02:00