[Fmsystem-commits] [17323] API: session handling

[sigurdne]

Revision: 17323
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17323
Author:   sigurdne
Date:     2017-11-17 14:06:48 -0500 (Fri, 17 Nov 2017)
Log Message:
-----------
API: session handling

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

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2017-11-17 15:09:58 UTC (rev 
17322)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2017-11-17 19:06:48 UTC (rev 
17323)
@@ -162,9 +162,13 @@
 
                                $this->_phpgw_set_cookie_params();
                        }
+                       else if (!empty($_GET[session_name()]))
+                       {
+                               $this->_sessionid = 
phpgw::get_var(session_name(),'string', 'GET');
+                       }
                        else
                        {
-                               $this->_sessionid       = 
phpgw::get_var(session_name()); // GET or POST
+                               $this->_sessionid = 
phpgw::get_var(session_name(), 'string', 'POST');
                        }
 
 
@@ -671,7 +675,7 @@
                                {
                                        if ( is_array($extravars) )
                                        {
-                                               $extravars = 
array_merge($extravars, $this->_get_session_vars());
+                                               $extravars = 
array_merge($this->_get_session_vars(), $extravars);
                                        }
                                        else
                                        {