Workarounds for Russian Apache and charsets/attachments problem.

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index a1adc682901004d44d4dd172aa0a4cddc0feb2b0..b99ad2e04d9c877200ee89455ed420be5fafaec2 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -10,10 +10,12 @@
     **  prevents users from reposting their form data after a
     **  successful logout
     **
+    **  $Id$
     **/
 
    if (!isset($strings_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,14 +25,13 @@
 
    header("Pragma: no-cache");
    $location = get_location();
-   header("Location: $location/webmail.php");
 
    session_set_cookie_params (0, $base_uri);
    session_start();
 
    session_register ("base_uri");
 
-   if(!isset($username)) {
+   if(!isset($login_username)) {
       exit;
    }
 
@@ -57,10 +58,15 @@
       $key = OneTimePadEncrypt($secretkey, $onetimepad);
       session_register("onetimepad");
       // verify that username and password are correct
-      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      if ($force_username_lowercase)
+          $login_username = strtolower($login_username);
+      $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
+         if (!$imapConnection) {
+               exit;
+         }
       sqimap_logout($imapConnection);
 
-      setcookie("username", $username, 0, $base_uri);
+      setcookie("username", $login_username, 0, $base_uri);
       setcookie("key", $key, 0, $base_uri);
       setcookie("logged_in", 1, 0, $base_uri);
       do_hook ("login_verified");
@@ -69,4 +75,5 @@
    session_register ("user_is_logged_in");
    $user_is_logged_in = true;
 
+   header("Location: $location/webmail.php");
 ?>