[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions_db.inc.php,1.10,1.11
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions_db.inc.php,1.10,1.11 class.sessions_php4.inc.php,1.14,1.15 |
Date: |
Sun, 15 Sep 2002 18:14:26 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv24803/phpgwapi/inc
Modified Files:
class.sessions_db.inc.php class.sessions_php4.inc.php
Log Message:
One more fix for the cookie stuff. This will at least delete properly.
Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sessions_db.inc.php 14 Sep 2002 21:58:39 -0000 1.10
--- class.sessions_db.inc.php 15 Sep 2002 22:14:24 -0000 1.11
***************
*** 51,54 ****
--- 51,56 ----
);
+ var $cookie_domain;
+
/*************************************************************************\
* Constructor just loads up some defaults from cookies
*
***************
*** 63,66 ****
--- 65,69 ----
/* Create the crypto object */
$GLOBALS['phpgw']->crypto =
CreateObject('phpgwapi.crypto');
+ $this->phpgw_set_cookiedomain()
}
***************
*** 296,302 ****
}
! function phpgw_set_domain()
{
! $dom = $GLOBALS['HTTP_HOST'];
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
{
--- 299,305 ----
}
! function phpgw_set_cookiedomain()
{
! $dom = $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'];
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
{
***************
*** 306,314 ****
if (count($parts) > 2)
{
! $this->dom =
'.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
}
else
{
! $this->dom = '';
}
}
--- 309,317 ----
if (count($parts) > 2)
{
! $this->cookie_domain =
'.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
}
else
{
! $this->cookie_domain = '';
}
}
***************
*** 316,324 ****
function
phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
{
! if (!$this->dom)
{
! $this->phpgw_set_domain();
}
!
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->dom);
}
--- 319,327 ----
function
phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
{
! if (!$this->cookie_domain)
{
! $this->phpgw_set_cookiedomain();
}
!
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain);
}
Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.sessions_php4.inc.php 14 Sep 2002 21:58:39 -0000 1.14
--- class.sessions_php4.inc.php 15 Sep 2002 22:14:24 -0000 1.15
***************
*** 49,53 ****
);
! var $dom;
/*************************************************************************\
--- 49,53 ----
);
! var $cookie_domain;
/*************************************************************************\
***************
*** 60,63 ****
--- 60,64 ----
/* Create the crypto object */
$GLOBALS['phpgw']->crypto =
CreateObject('phpgwapi.crypto');
+ $this->phpgw_set_cookiedomain();
}
***************
*** 281,287 ****
}
! function phpgw_set_domain()
{
! $dom = $GLOBALS['HTTP_HOST'];
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
{
--- 282,288 ----
}
! function phpgw_set_cookiedomain()
{
! $dom = $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'];
if (preg_match("/^(.*):(.*)$/",$dom,$arr))
{
***************
*** 291,299 ****
if (count($parts) > 2)
{
! $this->dom =
'.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
}
else
{
! $this->dom = '';
}
}
--- 292,300 ----
if (count($parts) > 2)
{
! $this->cookie_domain) =
'.'.$parts[count($parts)-2].'.'.$parts[count($parts)-1];
}
else
{
! $this->cookie_domain) = '';
}
}
***************
*** 301,309 ****
function
phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
{
! if (!$this->dom)
{
! $this->phpgw_set_domain();
}
!
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->dom);
}
--- 302,310 ----
function
phpgw_setcookie($cookiename,$cookievalue='',$cookietime=0)
{
! if (!$this->cookie_domain)
{
! $this->phpgw_set_cookiedomain();
}
!
setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain));
}
***************
*** 683,686 ****
--- 684,688 ----
session_unset();
session_destroy();
+ $this->phpgw_setcookie(session_name());
//$GLOBALS['phpgw']->db->query("UPDATE phpgw_access_log
SET lo='" . time() . "' WHERE sessionid='"
// . $sessionid . "'",__LINE__,__FILE__);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions_db.inc.php,1.10,1.11 class.sessions_php4.inc.php,1.14,1.15,
Mark A Peters <address@hidden> <=