holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug with not working language-selection and SQL error because of empty session-id in phpgw_app_session

Browse Source
This commit is contained in:
Ralf Becker 2004-07-09 15:17:04 +00:00
parent 0ce4cbad1a
commit 759d1d4f17
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
login.php
View File

@ -28,7 +28,7 @@
include('./header.inc.php'); include('./header.inc.php');
if(function_exists('CreateObject')) if(function_exists('CreateObject'))
{ {
$GLOBALS['phpgw']->sessions = CreateObject('phpgwapi.sessions'); $GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions');
} }
else else
{ {
@ -74,15 +74,15 @@
/* /*
if($GLOBALS['phpgw_info']['server']['usecookies'] == True) 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) if($_GET['cd'] != 10 && $GLOBALS['phpgw_info']['server']['usecookies'] == False)
{ {
$GLOBALS['phpgw']->sessions->setcookie('sessionid'); $GLOBALS['phpgw']->session->setcookie('sessionid');
$GLOBALS['phpgw']->sessions->setcookie('kp3'); $GLOBALS['phpgw']->session->setcookie('kp3');
$GLOBALS['phpgw']->sessions->setcookie('domain'); $GLOBALS['phpgw']->session->setcookie('domain');
} }
*/ */
@ -119,14 +119,14 @@
return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>'; return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>';
break; break;
case 10: case 10:
$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid'); $GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3'); $GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain'); $GLOBALS['phpgw']->session->phpgw_setcookie('domain');
//fix for bug php4 expired sessions bug //fix for bug php4 expired sessions bug
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4') 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>'; return '<font color="#FF0000">' . lang('Your session could not be verified.') . '</font>';

2
phpgwapi/inc/class.preferences.inc.php
View File

@ -342,7 +342,7 @@
if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '') if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
{ {
$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value; $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; break;