Changeset 2850 for branches/2.0/phpgwapi/inc/class.sessions.inc.php

Timestamp:

05/25/10 11:21:48 (14 years ago)

Author:

niltonneto

Message:

Ticket #1041 - Corrigido problema na validação da sessão por IP.

File:

• branches/2.0/phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)

branches/2.0/phpgwapi/inc/class.sessions.inc.php

@@ -404 +404 @@
                 * Get the ip address of current users
                 *
-                * @return string ip address
+                * @return string HTTP_X_FORWARDED_FOR (if exists) and REMOTE_ADDR ip addresses.
                 */
                 function getuser_ip()
                 {
-                /*
-                        if (getenv(HTTP_X_FORWARDED_FOR))
-                        {
-                                if (getenv(HTTP_CLIENT_IP))
-                                {
-                                        $ip=getenv(HTTP_CLIENT_IP);
-                                }
-                                else
-                                {
-                                        $ip=getenv(HTTP_X_FORWARDED_FOR);
-                                }
-                                $ip_proxy=getenv(REMOTE_ADDR);
-                        }
-                        else
-                        {
-                                $ip=getenv(REMOTE_ADDR);
-                        }
-                        return $ip;
-                */
-                        return (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
+                        return (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR']."," : "").$_SERVER['REMOTE_ADDR'];
                 }