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

use egw::redirect_link() and removed html markup from password check

Browse Source
This commit is contained in:
Ralf Becker 2010-06-06 19:11:51 +00:00
parent 48573b83a5
commit 34e0d6bd48
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
login.php
View File

@ -234,7 +234,7 @@ else
!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->egw_setcookie('eGW_remember','',0,'/'); $GLOBALS['egw']->session->egw_setcookie('eGW_remember','',0,'/');
$GLOBALS['egw']->redirect($GLOBALS['egw']->link('/login.php','cd=5')); egw::redirect_link('/login.php','cd=5');
} }
#if(!isset($_COOKIE['eGroupWareLoginTime'])) #if(!isset($_COOKIE['eGroupWareLoginTime']))
#{ #{
@ -280,7 +280,7 @@ else
if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid']) if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
{ {
$GLOBALS['egw']->session->egw_setcookie('eGW_remember','',0,'/'); $GLOBALS['egw']->session->egw_setcookie('eGW_remember','',0,'/');
$GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['egw']->session->cd_reason); egw::redirect_link('/login.php?cd=' . $GLOBALS['egw']->session->cd_reason);
} }
else else
{ {
@ -346,23 +346,25 @@ else
} }
// Check for save passwd // Check for save passwd
if($GLOBALS['egw_info']['server']['check_save_passwd'] && $GLOBALS['egw']->acl->check('changepassword', 1, 'preferences') && $unsave_msg = $GLOBALS['egw']->auth->crackcheck($passwd)) if($GLOBALS['egw_info']['server']['check_save_passwd'] && $GLOBALS['egw']->acl->check('changepassword', 1, 'preferences') &&
($unsave_msg = $GLOBALS['egw']->auth->crackcheck($passwd)))
{ {
$GLOBALS['egw']->log->write(array('text'=>'D-message, User '. $login. ' authenticated with an unsave password','file' => __FILE__,'line'=>__LINE__)); $GLOBALS['egw']->log->write(array('text'=>'D-message, User '. $login. ' authenticated with an unsave password','file' => __FILE__,'line'=>__LINE__));
$message = '<font color="red">'. lang('eGroupWare checked your password for saftyness. You have to change your password for the following reason:').'<br>'; $message = lang('eGroupWare checked your password for safetyness. You have to change your password for the following reason:')."\n";
$GLOBALS['egw']->redirect_link('/index.php', array('menuaction' => 'preferences.uipassword.change','message' => $message. $unsave_msg. '</font>')); egw::redirect_link('/index.php', array(
'menuaction' => 'preferences.uipassword.change',
'message' => $message . $unsave_msg,
'cd' => 'yes',
));
} }
else else
{ {
$GLOBALS['egw']->redirect_link($forward,$extra_vars); egw::redirect_link($forward,$extra_vars);
} }
} }
} }
else else
{ {
// !!! DONT CHANGE THESE LINES !!!
// If there is something wrong with this code TELL ME!
// Commenting out the code will not fix it. (jengo)
if(isset($_COOKIE['last_loginid'])) if(isset($_COOKIE['last_loginid']))
{ {
$accounts =& CreateObject('phpgwapi.accounts'); $accounts =& CreateObject('phpgwapi.accounts');