X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=50efeb3f795f0b104e3b693c78002a38269b453e;hb=acd7fdf263929e876918bc434086626ec871afb1;hp=01a7bcec0752622129b74c916613eac8d3c1532b;hpb=07a52f9f576c00c7f6d5a35e84b740dc69f2ef92;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 01a7bcec..50efeb3f 100644
--- a/src/login.php
+++ b/src/login.php
@@ -12,21 +12,16 @@
* @package squirrelmail
*/
+// reduces the files included in init.php
+$sInitLocation = 'login';
+
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
+
/* SquirrelMail required files. */
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'functions/i18n.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/constants.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/forms.php');
@@ -37,27 +32,23 @@ require_once(SM_PATH . 'functions/forms.php');
set_up_language($squirrelmail_language, TRUE, TRUE);
/**
- * Find out the base URI to set cookies.
- */
-if (!function_exists('sqm_baseuri')){
- require_once(SM_PATH . 'functions/display_messages.php');
-}
-$base_uri = sqm_baseuri();
-
-/*
* 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
+ * we get a new one, but make sure we preserve session_expired_*
*/
-@sqsession_start();
-header('Pragma: no-cache');
+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,
@@ -80,7 +71,9 @@ if($imap_auth_mech == 'login') {
$string .= _("Also, the use of TLS may allow SquirrelMail to login.").'
';
}
$string .= _("Please contact your system administrator and report this error.");
- error_box($string,$color);
+ error_box($string);
+ // display footer (closes html tags) and stop script execution
+ $oTemplate->display('footer.tpl');
exit;
}
}
@@ -91,8 +84,7 @@ do_hook('login_cookie');
$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
/* Output the javascript onload function. */
-
-$header = "