X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fredirect.php;h=5e7f9d052dafec8c7d7159530ab2d042675acd4a;hp=b99ad2e04d9c877200ee89455ed420be5fafaec2;hb=0e8c1c9a1191a7dfae532c959e30a8a846a131e7;hpb=245a6892bf5c780904ef9677f24d624ea17e0749
diff --git a/src/redirect.php b/src/redirect.php
index b99ad2e0..5e7f9d05 100644
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -13,9 +13,8 @@
** $Id$
**/
- if (!isset($strings_php))
- include ("../functions/strings.php");
- include("../config/config.php");
+ include ('../functions/strings.php');
+ include('../config/config.php');
// Before starting the session, the base URI must be known.
// Assuming that this file is in the src/ subdirectory (or
@@ -23,57 +22,66 @@
ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
$base_uri = $regs[1];
- header("Pragma: no-cache");
+ header('Pragma: no-cache');
$location = get_location();
session_set_cookie_params (0, $base_uri);
session_start();
- session_register ("base_uri");
+ session_unregister ('user_is_logged_in');
+ session_register ('base_uri');
if(!isset($login_username)) {
+ echo "\n";
+ echo "
";
+ echo "";
+ echo ""._("You must be logged in to access this page.")."
";
+ echo ""._("Go to the login page")."\n";
+ echo "";
+ echo "\n";
exit;
}
// Refresh the language cookie.
if (isset($squirrelmail_language)) {
- setcookie("squirrelmail_language", $squirrelmail_language, time()+2592000);
+ setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000);
}
- include ("../config/config.php");
- include ("../functions/prefs.php");
- include ("../functions/imap.php");
- if (!isset($plugin_php))
- include ("../functions/plugin.php");
- if (!isset($auth_php))
- include ("../functions/auth.php");
- if (!isset($strings_php))
- include ("../functions/strings.php");
+ include ('../functions/prefs.php');
+ include ('../functions/imap.php');
+ include ('../functions/plugin.php');
- if (!session_is_registered("user_is_logged_in") || $logged_in != 1) {
- do_hook ("login_before");
+ if (!session_is_registered('user_is_logged_in') || $logged_in != 1) {
+ do_hook ('login_before');
$onetimepad = OneTimePadCreate(strlen($secretkey));
$key = OneTimePadEncrypt($secretkey, $onetimepad);
- session_register("onetimepad");
+ session_register('onetimepad');
// verify that username and password are correct
if ($force_username_lowercase)
$login_username = strtolower($login_username);
$imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
if (!$imapConnection) {
- exit;
+ echo "\n";
+ echo "
";
+ echo "";
+ echo ""._("There was an error contacting the mail server.")."
";
+ echo _("Contact your administrator for help.")."\n";
+ echo "";
+ echo "\n";
+ exit;
}
sqimap_logout($imapConnection);
- setcookie("username", $login_username, 0, $base_uri);
- setcookie("key", $key, 0, $base_uri);
- setcookie("logged_in", 1, 0, $base_uri);
- do_hook ("login_verified");
+ setcookie('username', $login_username, 0, $base_uri);
+ setcookie('key', $key, 0, $base_uri);
+ setcookie('logged_in', 1, 0, $base_uri);
+ do_hook ('login_verified');
}
- session_register ("user_is_logged_in");
$user_is_logged_in = true;
+ session_register ('user_is_logged_in');
- header("Location: $location/webmail.php");
+ header("Location: webmail.php");
?>