Fixed ary_sort problem.

[squirrelmail.git] / src / login.php
diff --git a/src/login.php b/src/login.php

index 6da9abd7c9e46fe0dfd18eb020a47281c3b3c46b..ad71c775aa502a8f8be5872e299e6dc50ab3fa83 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -47,18 +47,6 @@
     ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
     $base_uri = $regs[1];
  
-   if ($testingcookie != 1){ 
-      setcookie("TestCookie", "Checking cookies", 0 , $base_uri);
-      header("Location: " . $base_uri . "src/login.php?testingcookie=1");
-   }
-   if(!isset($TestCookie)){
-      $no_cookies = true;
-   } else {
-      // Cookies are enabled... Deleting test cookie.
-      setcookie("TestCookie", "", 0, $base_uri);
-      $no_cookies = false;
-   }
-   
     setcookie("username", "", 0, $base_uri);
     setcookie("key", "", 0, $base_uri);
     setcookie("logged_in", 0, 0, $base_uri);
@@ -73,6 +61,11 @@
     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";
+   
+   $username_form_name = '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);
@@ -93,13 +86,13 @@
     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=secretkey>\n";
+   echo "                  <INPUT TYPE=PASSWORD NAME=\"$password_form_name\">\n";
     echo "               </TD>\n"; 
     echo "         </TABLE>\n";
     echo "      </TD>\n";
@@ -110,12 +103,6 @@
     echo "\"></CENTER>\n";
     echo "      </TD>\n";
     echo "   </TR>\n";
-   if ($no_cookies){
-     echo "   <TR><TD>\n";
-     echo "<FONT COLOR=\"FF0000\"><CENTER>It appears that your browser is not accepting cookies.".
-          " Please make sure you have cookies enabled before proceding.</CENTER></FONT>";
-     echo "   </TD></TR>\n";
-   } 
     echo "</TABLE>\n";
     echo "<input type=hidden name=just_logged_in value=1>\n";
     echo "</FORM>\n";