From 759d1d4f1710f0d4ad675a8ad6b1df531d29bffa Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 9 Jul 2004 15:17:04 +0000
Subject: [PATCH] fixed bug with not working language-selection and SQL error
 because of empty session-id in phpgw_app_session

---
 login.php                              | 18 +++++++++---------
 phpgwapi/inc/class.preferences.inc.php |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/login.php b/login.php
index 4debe756b5..0d40e72365 100755
--- a/login.php
+++ b/login.php
@@ -28,7 +28,7 @@
 		include('./header.inc.php');
 		if(function_exists('CreateObject'))
 		{
-			$GLOBALS['phpgw']->sessions = CreateObject('phpgwapi.sessions');
+			$GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions');
 		}
 		else
 		{
@@ -74,15 +74,15 @@
 /*
 	if($GLOBALS['phpgw_info']['server']['usecookies'] == True)
 	{
-		$GLOBALS['phpgw']->sessions->phpgw_setcookie('eGroupWareLoginTime', time());
+		$GLOBALS['phpgw']->session->phpgw_setcookie('eGroupWareLoginTime', time());
 	}
 */
 /*
 	if($_GET['cd'] != 10 && $GLOBALS['phpgw_info']['server']['usecookies'] == False)
 	{
-		$GLOBALS['phpgw']->sessions->setcookie('sessionid');
-		$GLOBALS['phpgw']->sessions->setcookie('kp3');
-		$GLOBALS['phpgw']->sessions->setcookie('domain');
+		$GLOBALS['phpgw']->session->setcookie('sessionid');
+		$GLOBALS['phpgw']->session->setcookie('kp3');
+		$GLOBALS['phpgw']->session->setcookie('domain');
 	}
 */
 
@@ -119,14 +119,14 @@
 				return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>';
 				break;
 			case 10:
-				$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid');
-				$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3');
-				$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain');
+				$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+				$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+				$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
 
 				//fix for bug php4 expired sessions bug
 				if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
 				{
-					$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
+					$GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
 				}
 
 				return '<font color="#FF0000">' . lang('Your session could not be verified.') . '</font>';
diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index dbf7578a1e..2901d1c779 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -342,7 +342,7 @@
 					if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
 					{
 						$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
-						$GLOBALS['phpgw']->sessions->appsession('preferences','preferences',$this->session);
+						$GLOBALS['phpgw']->session->appsession('preferences','preferences',$this->session);
 					}
 					break;