X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flogin.php;h=8a8c74582872daa1a2d25501dbffa96221157c81;hb=2cefa62ab30cc730b8683ee47ec69728ab89d773;hp=4e83354c10abe302f93c41cbbbf64957f7374ede;hpb=832dc1e2d671a5ff24a964f4be7b1530431afd39;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 4e83354c..8a8c7458 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,31 +3,24 @@
/**
* login.php -- simple login screen
*
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This a simple login screen. Some housekeeping is done to clean
* cookies and find language.
*
+ * @copyright 1999-2012 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the login page */
+define('PAGE_NAME', '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,23 +30,6 @@ 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();
-
-header('Pragma: no-cache');
-
/**
* This detects if the IMAP server has logins disabled, and if so,
* squelches the display of the login form and puts up a message
@@ -75,27 +51,33 @@ 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;
}
}
}
-do_hook('login_cookie');
+$username_form_name = 'login_username';
+$password_form_name = 'secretkey';
+do_hook('login_cookie', $null);
-$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
+$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? sm_encode_html_special_chars($loginname) : '');
+//FIXME: should be part of the template, not the core!
/* Output the javascript onload function. */
-
-$header = "