X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flogin.php;h=aeb0d44c04ea3099c3d63b4c9597a809b49bd24d;hb=80bb6546e5f0602d8c055df1f37b64ab030d6657;hp=cc4de2133a43c226eeaed880a5ff7187a6aebb5b;hpb=d7d3c4d435ff1820555e557fcccc9a9d52bf9e93;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index cc4de213..aeb0d44c 100644
--- a/src/login.php
+++ b/src/login.php
@@ -8,61 +8,47 @@
** This a simple login screen. Some housekeeping is done to clean
** cookies and find language.
**
+ ** $Id$
**/
- if (!isset($config_php))
- include("../config/config.php");
if (!isset($strings_php))
include("../functions/strings.php");
+ if (!isset($config_php))
+ include("../config/config.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
if (!isset($plugin_php))
include("../functions/plugin.php");
- // let's check to see if they compiled with gettext support
- if (!function_exists("_")) {
- function _($string) {
- return $string;
- }
- } else {
- // $squirrelmail_language is set by a cookie when the user selects
- // language and logs out
-
- // Use HTTP content language negotiation if cookie not set
- if (!isset($squirrelmail_language) && isset($HTTP_ACCEPT_LANGUAGE)) {
- $squirrelmail_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
- }
-
- if (isset($squirrelmail_language)) {
- if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
- putenv("LC_ALL=".$squirrelmail_language);
- bindtextdomain("squirrelmail", "../locale/");
- textdomain("squirrelmail");
- header ("Content-Type: text/html; charset=".$languages[$squirrelmail_language]["CHARSET"]);
- }
- }
- }
+ // $squirrelmail_language is set by a cookie when the user selects
+ // language and logs out
+ set_up_language($squirrelmail_language, true);
// Need the base URI to set the cookies. (Same code as in webmail.php)
ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
$base_uri = $regs[1];
- setcookie("username", "", 0, $base_uri);
- setcookie("key", "", 0, $base_uri);
+ setcookie("username", '', 0, $base_uri);
+ setcookie("key", '', 0, $base_uri);
setcookie("logged_in", 0, 0, $base_uri);
// In case the last session was not terminated properly, make sure
// we get a new one.
- setcookie("PHPSESSID", "", 0, $base_uri);
+ $cookie_params = session_get_cookie_params();
+ setcookie(session_name(),"",0,$cookie_params["domain"].$cookie_params["path"]);
echo "";
echo "";
- echo _("SquirrelMail Login");
+ echo $org_name . " - " . _("Login");
echo "\n";
echo "\n";
-
- echo "