Experimental commit:

[ctracker.git] / libs / lib_general.php

diff --git a/libs/lib_general.php b/libs/lib_general.php
index e2d0005b27679af9d1c9a05bd421455e85785782..fe382dc249938179c20c9db3921ea562de560dc5 100644 (file)
--- a/libs/lib_general.php
+++ b/libs/lib_general.php
@@ -93,7 +93,7 @@ function determineCrackerTrackerRealRemoteAddress () {
                $address = $_SERVER['HTTP_CLIENT_IP'];
        } elseif (isset($_SERVER['REMOTE_ADDR'])) {
                // The regular address when no proxy was used
-               $address = $_SERVER['REMOTE_ADDR'];
+               $address = getenv('REMOTE_ADDR');
        }
 
        // This strips out the real address from proxy output
@@ -471,7 +471,7 @@ function crackerTrackerSendRawRedirect ($url) {
 
 // Removes all ctracker-related data from global space
 function unsetCtrackerData () {
-       // Unset all
+       // Unset all ctracker data
        foreach (array(
                        'ctracker_host',
                        'ctracker_dbname',
@@ -490,6 +490,9 @@ function unsetCtrackerData () {
                        'ctracker_last_result',
                        'ctracker_config',
                        'ctracker_updates',
+                       'ctracker_language',
+                       'ctracker_localized',
+                       'ctracker_link',
                ) as $key) {
                        // Unset it
                        unset($GLOBALS[$key]);