Changeset 3018 for branches/2.2/phpgwapi/inc/class.sessions.inc.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/phpgwapi/inc/class.sessions.inc.php (modified) (2 diffs)

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

@@ -343 +343 @@
                         }
 
-                        /* ExpressoLivre
-                           Necessário comentar para que o redirecionamento de uma sessão
-                           https para uma http funcionasse atrás de um proxy
-                        */
-
-                        /*
-                        if (@$GLOBALS['phpgw_info']['server']['sessions_checkip'])
-                        {
-                                if((PHP_OS != 'Windows') && (PHP_OS != 'WINNT') &&
-                                        (!$GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip())
-                                )
-                                {
-                                        //echo "IP do cliente com https   ---->  ".$GLOBALS['phpgw_info']['user']['session_ip'];
-                                        //echo "<BR>IP do cliente com http ---->  ".$this->getuser_ip();
-                                        if(is_object($GLOBALS['phpgw']->log))
-                                        {
-                                                // This needs some better wording
-                                                $GLOBALS['phpgw']->log->message(array(
-                                                        'text' => 'W-VerifySession, IP %1 doesn\'t match IP %2 in session table',
-                                                        'p1'   => $this->getuser_ip(),
-                                                        'p2'   => $GLOBALS['phpgw_info']['user']['session_ip'],
-                                                        'line' => __LINE__,
-                                                        'file' => __FILE__
-                                                ));
-                                                $GLOBALS['phpgw']->log->commit();
-                                        }
-                                        return False;
-                                }
-                        }
-                        */
-
+                        
                         $GLOBALS['phpgw']->acl->acl($this->account_id);
                         $GLOBALS['phpgw']->accounts->accounts($this->account_id);
@@ -408 +378 @@
                 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']; 
                 }