extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

verify that get_var did not return an empty cookie var (breaks noncookie sessions)

Browse Source
This commit is contained in:
Miles Lott 2002-08-12 00:59:34 +00:00
parent c60fbfd183
commit 0a3912cf96
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.sessions_db.inc.php
View File

@ -118,8 +118,16 @@
{
if(empty($sessionid) || !$sessionid)
{
$sessionid = get_var('sessionid',Array('COOKIE','GET'));
$kp3 = get_var('kp3',Array('COOKIE','GET'));
$sessionid = get_var('sessionid',array('COOKIE'));
if(@empty($sessionid))
{
$sessionid = get_var('sessionid',array('GET'));
}
$kp3 = get_var('kp3',array('COOKIE'));
if(@empty($kp3))
{
$kp3 = get_var('kp3',array('GET'));
}
}
$db = $GLOBALS['phpgw']->db;

23
phpgwapi/inc/class.sessions_php4.inc.php
View File

@ -113,13 +113,20 @@
{
if(empty($sessionid) || !$sessionid)
{
$sessionid = get_var('sessionid',Array('COOKIE','GET'));
$kp3 = get_var('kp3',Array('COOKIE','GET'));
$sessionid = get_var('sessionid',array('COOKIE'));
if(@empty($sessionid))
{
$sessionid = get_var('sessionid',array('GET'));
}
$kp3 = get_var('kp3',array('COOKIE'));
if(@empty($kp3))
{
$kp3 = get_var('kp3',array('GET'));
}
}
$this->sessionid = $sessionid;
$this->kp3 = $kp3;
session_start();
$GLOBALS['phpgw_session'] = $GLOBALS['HTTP_SESSION_VARS']['phpgw_session'];
@ -389,7 +396,7 @@
$GLOBALS['phpgw_session']['session_dla'] = $now;
$GLOBALS['phpgw_session']['session_action'] = $GLOBALS['PHP_SELF'];
$GLOBALS['phpgw_session']['session_flags'] = $session_flags;
session_register('phpgw_session');
$GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = $GLOBALS['phpgw_session'];
@ -602,7 +609,7 @@
$GLOBALS['phpgw_session']['session_dla'] = $now;
$GLOBALS['phpgw_session']['session_action'] = $GLOBALS['PHP_SELF'];
$GLOBALS['phpgw_session']['session_flags'] = $session_flags;
session_register('phpgw_session');
$GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = $GLOBALS['phpgw_session'];
@ -630,7 +637,7 @@
$GLOBALS['phpgw_session']['session_dla'] = time();
$GLOBALS['phpgw_session']['session_action'] = $action;
session_register('phpgw_session');
$GLOBALS['HTTP_SESSION_VARS']['phpgw_session'] = $GLOBALS['phpgw_session'];
@ -742,7 +749,7 @@
$this->appsession('phpgw_info_cache','phpgwapi',$phpgw_info_temp);
}
}
function appsession($location = 'default', $appname = '', $data = '##NOTHING##')
{
if (! $appname)
@ -858,7 +865,7 @@
$url = $app.'/'.$url;
}
}
if($full_scriptname)
{
$webserver_url_count = strlen($GLOBALS['phpgw_info']['server']['webserver_url'])-1;