extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

phpgw_setcookie --> egw_setcookie and removing old code - I have no idea what is was supposed to do

Browse Source
This commit is contained in:
Ralf Becker 2006-09-27 07:10:43 +00:00
parent a435f90c08
commit d6b7fc3c35
2 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
login.php
View File

@ -69,15 +69,15 @@
/* /*
if($GLOBALS['egw_info']['server']['usecookies'] == True) if($GLOBALS['egw_info']['server']['usecookies'] == True)
{ {
$GLOBALS['egw']->session->phpgw_setcookie('eGroupWareLoginTime', time()); $GLOBALS['egw']->session->egw_setcookie('eGroupWareLoginTime', time());
} }
*/ */
/* /*
if($_GET['cd'] != 10 && $GLOBALS['egw_info']['server']['usecookies'] == False) if($_GET['cd'] != 10 && $GLOBALS['egw_info']['server']['usecookies'] == False)
{ {
$GLOBALS['egw']->session->setcookie('sessionid'); $GLOBALS['egw']->session->egw_setcookie('sessionid');
$GLOBALS['egw']->session->setcookie('kp3'); $GLOBALS['egw']->session->egw_setcookie('kp3');
$GLOBALS['egw']->session->setcookie('domain'); $GLOBALS['egw']->session->egw_setcookie('domain');
} }
*/ */
@ -97,35 +97,21 @@
{ {
case 1: case 1:
return lang('You have been successfully logged out'); return lang('You have been successfully logged out');
break;
case 2: case 2:
return lang('Sorry, your login has expired'); return lang('Sorry, your login has expired');
break;
case 4: case 4:
return lang('Cookies are required to login to this site.'); return lang('Cookies are required to login to this site.');
break;
case 5: case 5:
return '<font color="FF0000">' . lang('Bad login or password') . '</font>'; return '<font color="red">' . lang('Bad login or password') . '</font>';
break;
case 98: case 98:
return '<font color="FF0000">' . lang('Account is expired') . '</font>'; return '<font color="red">' . lang('Account is expired') . '</font>';
break;
case 99: case 99:
return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>'; return '<font color="red">' . lang('Blocked, too many attempts') . '</font>';
break;
case 10: case 10:
$GLOBALS['egw']->session->phpgw_setcookie('sessionid'); $GLOBALS['egw']->session->egw_setcookie('sessionid');
$GLOBALS['egw']->session->phpgw_setcookie('kp3'); $GLOBALS['egw']->session->egw_setcookie('kp3');
$GLOBALS['egw']->session->phpgw_setcookie('domain'); $GLOBALS['egw']->session->egw_setcookie('domain');
return '<font color="red">' . lang('Your session could not be verified.') . '</font>';
//fix for bug php4 expired sessions bug
if(substr($GLOBALS['egw_info']['server']['sessions_type'],0,4) == 'php4')
{
$GLOBALS['egw']->session->phpgw_setcookie(EGW_PHPSESSID);
}
return '<font color="#FF0000">' . lang('Your session could not be verified.') . '</font>';
break;
default: default:
return '&nbsp;'; return '&nbsp;';
} }
@ -205,7 +191,7 @@
if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' && if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' &&
!isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN'])) !isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN']))
{ {
$GLOBALS['egw']->session->phpgw_setcookie('eGW_remember'); $GLOBALS['egw']->session->egw_setcookie('eGW_remember');
$GLOBALS['egw']->redirect($GLOBALS['egw']->link('/login.php','cd=5')); $GLOBALS['egw']->redirect($GLOBALS['egw']->link('/login.php','cd=5'));
} }
#if(!isset($_COOKIE['eGroupWareLoginTime'])) #if(!isset($_COOKIE['eGroupWareLoginTime']))
@ -247,7 +233,7 @@
if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid']) if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
{ {
$GLOBALS['egw']->session->phpgw_setcookie('eGW_remember'); $GLOBALS['egw']->session->egw_setcookie('eGW_remember');
$GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['egw']->session->cd_reason); $GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['egw']->session->cd_reason);
} }
else else
@ -274,7 +260,7 @@
$remember_time = 2147483647; $remember_time = 2147483647;
break; break;
} }
$GLOBALS['egw']->session->phpgw_setcookie('eGW_remember',serialize(array( $GLOBALS['egw']->session->egw_setcookie('eGW_remember',serialize(array(
'login' => $login, 'login' => $login,
'passwd' => $passwd, 'passwd' => $passwd,
'passwd_type' => $passwd_type)), 'passwd_type' => $passwd_type)),

28
logout.php
View File

@ -33,19 +33,6 @@
if ($verified) if ($verified)
{ {
if (file_exists($GLOBALS['egw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']))
{
$dh = opendir($GLOBALS['egw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']);
while ($file = readdir($dh))
{
if ($file != '.' && $file != '..')
{
unlink($GLOBALS['egw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid'] . SEP . $file);
}
}
closedir($dh);
rmdir($GLOBALS['egw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']);
}
$GLOBALS['egw']->hooks->process('logout'); $GLOBALS['egw']->hooks->process('logout');
$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']); $GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
} }
@ -60,14 +47,9 @@
)); ));
} }
} }
$GLOBALS['egw']->session->phpgw_setcookie('eGW_remember'); $GLOBALS['egw']->session->egw_setcookie('eGW_remember');
$GLOBALS['egw']->session->phpgw_setcookie('sessionid'); $GLOBALS['egw']->session->egw_setcookie('sessionid');
$GLOBALS['egw']->session->phpgw_setcookie('kp3'); $GLOBALS['egw']->session->egw_setcookie('kp3');
$GLOBALS['egw']->session->phpgw_setcookie('domain'); $GLOBALS['egw']->session->egw_setcookie('domain');
if(substr($GLOBALS['egw_info']['server']['sessions_type'],0,4) == 'php4')
{
$GLOBALS['egw']->session->phpgw_setcookie(EGW_PHPSESSID);
}
$GLOBALS['egw']->redirect($redirectTarget); $GLOBALS['egw']->redirect($redirectTarget);
?>