#171

Signed-off-by: Tyler Cvetan <[email protected]>
SomethingSexy · Jan 27, 2015 · 5761f2c · 5761f2c
1 parent 5bd82dc
commit 5761f2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -133,7 +133,6 @@ public function checkAdmin() {
             $this->handleNotLoggedIn();
         }
     }
-
 
     function my_array_unique($array, $keep_key_assoc = false) {
         $duplicate_keys = array();
@@ -181,5 +180,14 @@ public function convertErrorsJSON($errors = null, $model = null) {
 
         return $retVal;
     }
+
+    protected function getClientIP() {
+        // this is for production
+        if (isset($_SERVER['HTTP_X_REAL_IP'])) {
+            return $_SERVER['HTTP_X_REAL_IP'];
+        } else {
+            return $this->request->clientIp();
+        }
+    }
 }
 ?>
diff --git a/app/Controller/CollectiblesController.php b/app/Controller/CollectiblesController.php
@@ -463,7 +463,7 @@ function view($id = null) {
             $this->set('userUploads', $extractUserUploads);
             $this->layout = 'require';
 
-            $this->getEventManager()->dispatch(new CakeEvent('Controller.Track.view', $this, array('type' => 'collectible', 'id' => $id, 'ip' => $this->request->clientIp(), 'user_id' => $this->getUserId())));
+            $this->getEventManager()->dispatch(new CakeEvent('Controller.Track.view', $this, array('type' => 'collectible', 'id' => $id, 'ip' => $this->getClientIP(), 'user_id' => $this->getUserId())));
         } else {
             $this->render('viewMissing');
         }