From 328f9a4bc5cf390ec4eea27c688708be89e446aa Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Sun, 15 Sep 2002 22:14:24 +0000
Subject: [PATCH] One more fix for the cookie stuff.  This will at least delete
 properly.

---
 logout.php                               |  6 +++---
 phpgwapi/inc/class.sessions_db.inc.php   | 17 ++++++++++-------
 phpgwapi/inc/class.sessions_php4.inc.php | 18 ++++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/logout.php b/logout.php
index 9facde6b5f..f347eca4cd 100755
--- a/logout.php
+++ b/logout.php
@@ -58,9 +58,9 @@
 
 	if($GLOBALS['phpgw_info']['server']['usecookies'])
 	{
-		Setcookie('sessionid');
-		Setcookie('kp3');
-		Setcookie('domain');
+		$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+		$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+		$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
 	}
 
 	$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?code=1',True);
diff --git a/phpgwapi/inc/class.sessions_db.inc.php b/phpgwapi/inc/class.sessions_db.inc.php
index f8fb3ebe71..1970a45a4f 100644
--- a/phpgwapi/inc/class.sessions_db.inc.php
+++ b/phpgwapi/inc/class.sessions_db.inc.php
@@ -50,6 +50,8 @@
 			'update_dla'   => True
 		);
 
+		var $cookie_domain;
+
 		/*************************************************************************\
 		* Constructor just loads up some defaults from cookies                    *
 		\*************************************************************************/
@@ -62,6 +64,7 @@
 
 			/* Create the crypto object */
 			$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
+			$this->phpgw_set_cookiedomain()
 		}
 
 		function DONTlist_methods($_type)
@@ -295,9 +298,9 @@
 				. "'",__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))
 			{
 				$dom = $arr[1];
@@ -305,21 +308,21 @@
 			$parts = explode('.',$dom);
 			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
 			{
-				$this->dom = '';
+				$this->cookie_domain = '';
 			}
 		}
 
 		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 = '')
diff --git a/phpgwapi/inc/class.sessions_php4.inc.php b/phpgwapi/inc/class.sessions_php4.inc.php
index 67d94cc895..35b0a06ac7 100644
--- a/phpgwapi/inc/class.sessions_php4.inc.php
+++ b/phpgwapi/inc/class.sessions_php4.inc.php
@@ -48,7 +48,7 @@
 			'update_dla'   => True
 		);
 
-		var $dom;
+		var $cookie_domain;
 
 		/*************************************************************************\
 		* Constructor just loads up some defaults from cookies                    *
@@ -59,6 +59,7 @@
 			$this->kp3       = get_var('kp3',Array('COOKIE','GET'));
 			/* Create the crypto object */
 			$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
+			$this->phpgw_set_cookiedomain();
 		}
 
 		function DONTlist_methods($_type)
@@ -280,9 +281,9 @@
 			// 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))
 			{
 				$dom = $arr[1];
@@ -290,21 +291,21 @@
 			$parts = explode('.',$dom);
 			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
 			{
-				$this->dom = '';
+				$this->cookie_domain) = '';
 			}
 		}
 
 		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 = '')
@@ -682,6 +683,7 @@
 
 			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__);