X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Flogin.php;h=226ccd8a2d9c17c2a01699419da1e0a1bbe6d57c;hp=5122421ab912ddc9b252b028ca2974c539f54f4b;hb=0bdd0f3e12337e14f78e436c3d6f44e36ba77632;hpb=9e06a3eab03fb20c67c6ea84a34b21ea5a528e19 diff --git a/src/login.php b/src/login.php index 5122421a..226ccd8a 100644 --- a/src/login.php +++ b/src/login.php @@ -30,25 +30,6 @@ require_once(SM_PATH . 'functions/forms.php'); */ set_up_language($squirrelmail_language, TRUE, TRUE); -/** - * In case the last session was not terminated properly, make sure - * we get a new one, but make sure we preserve session_expired_* - */ -if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) { - $sep = $_SESSION['session_expired_post']; - $sel = $_SESSION['session_expired_location']; - - sqsession_destroy(); - @sqsession_is_active(); - $_SESSION=array(); - sqsession_register($sep, 'session_expired_post'); - sqsession_register($sel, 'session_expired_location'); -} else { - sqsession_destroy(); - @sqsession_is_active(); - $_SESSION=array(); -} - /** * This detects if the IMAP server has logins disabled, and if so, * squelches the display of the login form and puts up a message @@ -86,8 +67,10 @@ $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($ /* Output the javascript onload function. */ $header = "