X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=50efeb3f795f0b104e3b693c78002a38269b453e;hb=acd7fdf263929e876918bc434086626ec871afb1;hp=02e81c694d2044b3fe6b35af29a4cc2fb4f3b6f3;hpb=1b858d863d345dc7bcc4bed0c169091b084b3a0c;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 02e81c69..50efeb3f 100644
--- a/src/login.php
+++ b/src/login.php
@@ -31,20 +31,24 @@ 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.
- */
-sqsession_destroy();
/**
- * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
- * http://bugs.php.net/13834
- * SID constant is not destroyed in PHP 4.1.2, 4.2.3 and maybe other
- * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
+ * In case the last session was not terminated properly, make sure
+ * we get a new one, but make sure we preserve session_expired_*
*/
-@sqsession_is_active();
-$_SESSION=array();
-
+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,
@@ -125,18 +129,17 @@ if (isset($org_logo) && $org_logo) {
$width_and_height = '';
if (isset($org_logo_width) && is_numeric($org_logo_width) &&
$org_logo_width>0) {
- $width_and_height = " width=\"$org_logo_width\"";
+ $width_and_height = "width=\"$org_logo_width\" ";
}
if (isset($org_logo_height) && is_numeric($org_logo_height) &&
$org_logo_height>0) {
- $width_and_height .= " height=\"$org_logo_height\"";
+ $width_and_height .= "height=\"$org_logo_height\" ";
}
$logo_str = '
'."\n";
+ 'class="sqm_loginImage" />
'."\n";
}
$sm_attribute_str = '';
@@ -145,34 +148,37 @@ if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
_("By the SquirrelMail Project Team")."
\n";
}
-$username_form_name = 'login_username';
-$password_form_name = 'secretkey';
-
if(sqgetGlobalVar('mailto', $mailto)) {
$rcptaddress = addHidden('mailto', $mailto);
} else {
$rcptaddress = '';
}
-$password_field = addPwField($password_form_name).
- addHidden('js_autodetect_results', SMPREF_JS_OFF).
- $rcptaddress .
- addHidden('just_logged_in', '1');
+$password_field = addPwField('secretkey');
+$login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
+ $rcptaddress .
+ addHidden('just_logged_in', '1');
session_write_close();
$oTemplate->assign('logo_str', $logo_str);
+$oTemplate->assign('logo_path', $org_logo);
$oTemplate->assign('sm_attribute_str', $sm_attribute_str);
$oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
-$oTemplate->assign('login_field', addInput($username_form_name, $loginname_value));
-$oTemplate->assign('password_field', $password_field);
-$oTemplate->assign('submit_field', addSubmit(_("Login")));
+$oTemplate->assign('login_field_value', $loginname_value);
+$oTemplate->assign('login_extra', $login_extra);
+
+echo ''."\n";
+echo '\n";
+do_hook('login_bottom');
+
// Turn off delayed error handling to make sure all errors are dumped.
-#$oErrorHandler->delayedErrors(false);
+$oErrorHandler->setDelayedErrors(false);
-#trigger_error('login');
$oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>