X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=d3f514e405c48042c571c763b2a62687a1b39dab;hb=1794d99316ac199aa68361e08a38b27faa07d5c4;hp=2eaea9e239ea6b4846a309aa2d5675c074dbf7d5;hpb=5cf2734273857ac74e5bd6a63ae84b6c83a64d97;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 2eaea9e2..d3f514e4 100644 --- a/src/login.php +++ b/src/login.php @@ -6,7 +6,7 @@ * This a simple login screen. Some housekeeping is done to clean * cookies and find language. * - * @copyright © 1999-2007 The SquirrelMail Project Team + * @copyright © 1999-2009 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -30,34 +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_* - */ -$sep = ''; -$sel = ''; -sqGetGlobalVar('session_expired_post', $sep, SQ_SESSION); -sqGetGlobalVar('session_expired_location', $sel, SQ_SESSION); - -/* blow away session */ -sqsession_destroy(); - -/** - * in some rare instances, the session seems to stick - * around even after destroying it (!!), so if it does, - * we'll manually flatten the $_SESSION data - */ -if (!empty($_SESSION)) { - $_SESSION = array(); -} - -/* start session and put session_expired_* variables back in session */ -@sqsession_is_active(); -if (!empty($sep) && !empty($sel)) { - sqsession_register($sep, 'session_expired_post'); - sqsession_register($sel, 'session_expired_location'); -} - /** * This detects if the IMAP server has logins disabled, and if so, * squelches the display of the login form and puts up a message @@ -87,6 +59,8 @@ if($imap_auth_mech == 'login') { } } +$username_form_name = 'login_username'; +$password_form_name = 'secretkey'; do_hook('login_cookie', $null); $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : ''); @@ -95,13 +69,15 @@ $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($ /* Output the javascript onload function. */ $header = "