Changeset 3867

Timestamp:

03/14/11 16:49:45 (12 years ago)

Author:

niltonneto

Message:

Ticket #1653 - Alterado de SCRIPT_URL para SCRIPT_NAME, por não ser variável padrão.

Location:

branches/2.2

Files:

• header.session.inc.php (modified) (3 diffs)
• mobile/inc/class.mobiletemplate.inc.php (modified) (1 diff)

branches/2.2/header.session.inc.php

@@ -35 +35 @@
 if (empty($_SESSION['phpgw_session']['session_id']) || $invalidSession) 
 {
-        if($_SESSION['connection_db_info']['user_auth'] && !strstr($_SERVER['SCRIPT_URL'],"/controller.php")) {
+        if($_SESSION['connection_db_info']['user_auth'] && !strstr($_SERVER['SCRIPT_NAME'],"/controller.php")) {
                 error_log( '[ INVALID SESSION ] >>>>' .$_SESSION['connection_db_info']['user_auth'].'<<<< - >>>>' . implode("",$user_agent), 0 ); 
                 $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid'); 
@@ -44 +44 @@
         unset($_SESSION);                               // Removing session values. 
         // From ExpressoAjax response "nosession" 
-        if(strstr($_SERVER['SCRIPT_URL'],"/controller.php")){ 
+        if(strstr($_SERVER['SCRIPT_NAME'],"/controller.php")){ 
                 echo serialize(array("nosession" => true)); 
                 exit; 
@@ -51 +51 @@
 else{ 
         // From ExpressoAjax update session_dla (datetime last access).  
-        if(strstr($_SERVER['SCRIPT_URL'],"/controller.php")) 
+        if(strstr($_SERVER['SCRIPT_NAME'],"/controller.php")) 
                 $_SESSION['phpgw_session']['session_dla'] = time(); 
 

branches/2.2/mobile/inc/class.mobiletemplate.inc.php

@@ -165 +165 @@
                         }
 
-                        $GLOBALS['phpgw']->session->appsession('mobile.last_url','mobile',$_SERVER["SCRIPT_URL"]);
+                        $GLOBALS['phpgw']->session->appsession('mobile.last_url','mobile',$_SERVER["SCRIPT_NAME"]);
                         $GLOBALS['phpgw']->session->appsession('mobile.last_request','mobile',$_REQUEST);
                 }