mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
One more fix for the cookie stuff. This will at least delete properly.
This commit is contained in:
parent
94eb165d39
commit
328f9a4bc5
@ -58,9 +58,9 @@
|
|||||||
|
|
||||||
if($GLOBALS['phpgw_info']['server']['usecookies'])
|
if($GLOBALS['phpgw_info']['server']['usecookies'])
|
||||||
{
|
{
|
||||||
Setcookie('sessionid');
|
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
|
||||||
Setcookie('kp3');
|
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
|
||||||
Setcookie('domain');
|
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
|
||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?code=1',True);
|
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?code=1',True);
|
||||||
|
@ -50,6 +50,8 @@
|
|||||||
'update_dla' => True
|
'update_dla' => True
|
||||||
);
|
);
|
||||||
|
|
||||||
|
var $cookie_domain;
|
||||||
|
|
||||||
/*************************************************************************\
|
/*************************************************************************\
|
||||||
* Constructor just loads up some defaults from cookies *
|
* Constructor just loads up some defaults from cookies *
|
||||||
\*************************************************************************/
|
\*************************************************************************/
|
||||||
@ -62,6 +64,7 @@
|
|||||||
|
|
||||||
/* Create the crypto object */
|
/* Create the crypto object */
|
||||||
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
||||||
|
$this->phpgw_set_cookiedomain()
|
||||||
}
|
}
|
||||||
|
|
||||||
function DONTlist_methods($_type)
|
function DONTlist_methods($_type)
|
||||||
@ -295,9 +298,9 @@
|
|||||||
. "'",__LINE__,__FILE__);
|
. "'",__LINE__,__FILE__);
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpgw_set_domain()
|
function phpgw_set_cookiedomain()
|
||||||
{
|
{
|
||||||
$dom = $GLOBALS['HTTP_HOST'];
|
$dom = $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'];
|
||||||
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
|
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
|
||||||
{
|
{
|
||||||
$dom = $arr[1];
|
$dom = $arr[1];
|
||||||
@ -305,21 +308,21 @@
|
|||||||
$parts = explode('.',$dom);
|
$parts = explode('.',$dom);
|
||||||
if (count($parts) > 2)
|
if (count($parts) > 2)
|
||||||
{
|
{
|
||||||
$this->dom = '.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
|
$this->cookie_domain = '.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->dom = '';
|
$this->cookie_domain = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
|
function phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
|
||||||
{
|
{
|
||||||
if (!$this->dom)
|
if (!$this->cookie_domain)
|
||||||
{
|
{
|
||||||
$this->phpgw_set_domain();
|
$this->phpgw_set_cookiedomain();
|
||||||
}
|
}
|
||||||
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->dom);
|
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
function create($login,$passwd = '',$passwd_type = '')
|
function create($login,$passwd = '',$passwd_type = '')
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
'update_dla' => True
|
'update_dla' => True
|
||||||
);
|
);
|
||||||
|
|
||||||
var $dom;
|
var $cookie_domain;
|
||||||
|
|
||||||
/*************************************************************************\
|
/*************************************************************************\
|
||||||
* Constructor just loads up some defaults from cookies *
|
* Constructor just loads up some defaults from cookies *
|
||||||
@ -59,6 +59,7 @@
|
|||||||
$this->kp3 = get_var('kp3',Array('COOKIE','GET'));
|
$this->kp3 = get_var('kp3',Array('COOKIE','GET'));
|
||||||
/* Create the crypto object */
|
/* Create the crypto object */
|
||||||
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
||||||
|
$this->phpgw_set_cookiedomain();
|
||||||
}
|
}
|
||||||
|
|
||||||
function DONTlist_methods($_type)
|
function DONTlist_methods($_type)
|
||||||
@ -280,9 +281,9 @@
|
|||||||
// With php4 sessions support this isnt really our job
|
// With php4 sessions support this isnt really our job
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpgw_set_domain()
|
function phpgw_set_cookiedomain()
|
||||||
{
|
{
|
||||||
$dom = $GLOBALS['HTTP_HOST'];
|
$dom = $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'];
|
||||||
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
|
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
|
||||||
{
|
{
|
||||||
$dom = $arr[1];
|
$dom = $arr[1];
|
||||||
@ -290,21 +291,21 @@
|
|||||||
$parts = explode('.',$dom);
|
$parts = explode('.',$dom);
|
||||||
if (count($parts) > 2)
|
if (count($parts) > 2)
|
||||||
{
|
{
|
||||||
$this->dom = '.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
|
$this->cookie_domain) = '.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->dom = '';
|
$this->cookie_domain) = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
|
function phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
|
||||||
{
|
{
|
||||||
if (!$this->dom)
|
if (!$this->cookie_domain)
|
||||||
{
|
{
|
||||||
$this->phpgw_set_domain();
|
$this->phpgw_set_cookiedomain();
|
||||||
}
|
}
|
||||||
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->dom);
|
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain));
|
||||||
}
|
}
|
||||||
|
|
||||||
function create($login,$passwd = '',$passwd_type = '')
|
function create($login,$passwd = '',$passwd_type = '')
|
||||||
@ -682,6 +683,7 @@
|
|||||||
|
|
||||||
session_unset();
|
session_unset();
|
||||||
session_destroy();
|
session_destroy();
|
||||||
|
$this->phpgw_setcookie(session_name());
|
||||||
//$GLOBALS['phpgw']->db->query("UPDATE phpgw_access_log SET lo='" . time() . "' WHERE sessionid='"
|
//$GLOBALS['phpgw']->db->query("UPDATE phpgw_access_log SET lo='" . time() . "' WHERE sessionid='"
|
||||||
// . $sessionid . "'",__LINE__,__FILE__);
|
// . $sessionid . "'",__LINE__,__FILE__);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user