Fixed problem where $username was being overwritten with the cookie's value
[squirrelmail.git] / src / login.php
index cc4de2133a43c226eeaed880a5ff7187a6aebb5b..b8beff478738ba5319e355e674b96ef49844ed02 100644 (file)
    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 "<HTML>";
    echo "<HEAD><TITLE>";
-   echo _("SquirrelMail Login");
+   echo $org_name . " - " . _("Login");
    echo "</TITLE></HEAD>\n";
    echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
-   echo "<FORM ACTION=\"webmail.php\" METHOD=\"POST\" NAME=f>\n";
+   echo "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
+   
+   $username_form_name = 'login_username';
+   $password_form_name = 'secretkey';
+   do_hook('login_top');
+   
    echo "<CENTER><IMG SRC=\"$org_logo\"</CENTER>\n";
    echo "<CENTER><SMALL>";
    printf (_("SquirrelMail version %s"), $version);
    echo "               <TD WIDTH=30% ALIGN=right>\n";
    echo _("Name:");
    echo "               </TD><TD WIDTH=* ALIGN=left>\n";
-   echo "                  <INPUT TYPE=TEXT NAME=username>\n";
+   echo "                  <INPUT TYPE=TEXT NAME=\"$username_form_name\">\n";
    echo "               </TD>\n";
    echo "            </TR><TR>\n";
    echo "               <TD WIDTH=30% ALIGN=right>\n";
    echo _("Password:");
    echo "               </TD><TD WIDTH=* ALIGN=left>\n";
-   echo "                  <INPUT TYPE=PASSWORD NAME=key>\n";
+   echo "                  <INPUT TYPE=PASSWORD NAME=\"$password_form_name\">\n";
    echo "               </TD>\n"; 
    echo "         </TABLE>\n";
    echo "      </TD>\n";