[Fmsystem-commits] [17361] API: more on session without cookie

[sigurdne]

Revision: 17361
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17361
Author:   sigurdne
Date:     2017-11-24 07:36:12 -0500 (Fri, 24 Nov 2017)
Log Message:
-----------
API: more on session without cookie

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.sessions.inc.php
    trunk/phpgwapi/inc/functions.inc.php

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2017-11-24 10:46:39 UTC (rev 
17360)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2017-11-24 12:36:12 UTC (rev 
17361)
@@ -713,6 +713,10 @@
                                                 */
                                                foreach ($_session_vars as 
$_session_key => $_session_value)
                                                {
+                                                       if($_session_key == 
'domain' && !$_session_value)
+                                                       {
+                                                               continue;
+                                                       }
                                                        
unset($extravars[$_session_key]);
                                                        
$extravars[$_session_key] = $_session_value;
                                                }

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2017-11-24 10:46:39 UTC (rev 
17360)
+++ trunk/phpgwapi/inc/functions.inc.php        2017-11-24 12:36:12 UTC (rev 
17361)
@@ -821,14 +821,6 @@
        {
                if (! $GLOBALS['phpgw']->session->verify())
                {
-                       if ( phpgw::get_var('menuaction', 'string', 'GET')  && 
phpgw::get_var('phpgw_return_as', 'string') != 'json')
-                       {
-                               unset($_GET['click_history']);
-                               unset($_GET['sessionid']);
-                               unset($_GET[session_name()]);
-                               unset($_GET['kp3']);
-                               
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=
 time()+60);
-                       }
                        $cd_array = array();
                        if ( isset($GLOBALS['phpgw']->session->cd_reason) && 
$GLOBALS['phpgw']->session->cd_reason )
                        {
@@ -845,6 +837,15 @@
                                $cd_array['domain'] = $_GET['domain'];
                        }
 
+                       if ( phpgw::get_var('menuaction', 'string', 'GET')  && 
phpgw::get_var('phpgw_return_as', 'string') != 'json')
+                       {
+                               unset($_GET['click_history']);
+                               unset($_GET['sessionid']);
+                               unset($_GET[session_name()]);
+                               unset($_GET['kp3']);
+                               
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=
 time()+60);
+                       }
+
                        if(phpgw::get_var('phpgw_return_as', 'string') == 
'json')
                        {
                                header('Content-Type: application/json');