Minor HTML change to make Opera see the message list like Netscape

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 07fca8914032f733d06370061e1b1e1882b3f224..0d8839665a01734c226206f9f35c85014d547098 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -13,17 +13,21 @@
    function sqimap_read_data ($imap_stream, $pre, $handle_errors, $response, $message) {
       global $color;
 
+      //$imap_general_debug = true;
+      $imap_general_debug = false;
+
       $read = fgets ($imap_stream, 1024);
-//             echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
+               if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
       $counter = 0;
       while ((substr($read, 0, strlen("$pre OK")) != "$pre OK") &&
              (substr($read, 0, strlen("$pre BAD")) != "$pre BAD") &&
              (substr($read, 0, strlen("$pre NO")) != "$pre NO")) {
          $data[$counter] = $read;
          $read = fgets ($imap_stream, 1024);
-//                     echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
+                       if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
          $counter++;
       }       
+      if ($imap_general_debug) echo "--<br>";
       if (substr($read, 0, strlen("$pre OK")) == "$pre OK") {
          $response = "OK";
          $message = trim(substr($read, strlen("$pre OK"), strlen($read)));
@@ -39,18 +43,18 @@
 
       if ($handle_errors == true) {
          if ($response == "NO") {
-            echo "<br><b><font color=$color[2]>";
+            echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Could not complete request.");
-            echo "</b><br>";
+            echo "</b><br>\n";
             echo _("Reason Given: ");
-            echo "$message</font><br>";
+            echo "$message</font><br>\n";
             exit;
          } else if ($response == "BAD") {
-            echo "<br><b><font color=$color[2]>";
+            echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Bad or malformed request.");
-            echo "</b><br>";
+            echo "</b><br>\n";
             echo _("Server responded: ");
-            echo "$message</font><br>";
+            echo "$message</font><br>\n";
             exit;
          }
       }
@@ -66,14 +70,26 @@
     **  will be displayed.  This function returns the imap connection handle.
     ******************************************************************************/
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
-      global $color;
+      global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
+
       $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
       $server_info = fgets ($imap_stream, 1024);
       
+      // Decrypt the password
+      $password = OneTimePadDecrypt($password, $onetimepad);
+
+      // This function can sometimes be called before the check for
+      // gettext is done.
+      if (!function_exists("_")) {
+         function _($string) {
+            return $string;
+         }
+      }
+
       /** Do some error correction **/
       if (!$imap_stream) {
          if (!$hide) {
-            echo "Error connecting to IMAP server: $imap_server_address.<br>\r\n";
+            printf (_("Error connecting to IMAP server: %s.")."<br>\r\n", $imap_server_address);
             echo "$error_number : $error_string<br>\r\n";
          }
          exit;
@@ -86,9 +102,33 @@
       if (substr($read, 0, 7) != "a001 OK") {
          if (!$hide) {
             if (substr($read, 0, 8) == "a001 BAD") {
-               echo "Bad request: $read<br>\r\n";
+               printf (_("Bad request: %s")."<br>\r\n", $read);
                exit;
             } else if (substr($read, 0, 7) == "a001 NO") {
+               // If the user does not log in with the correct
+               // username and password it is not possible to get the
+               // correct locale from the user's preferences.
+               // Therefore, apply the same hack as on the login
+               // screen.
+
+               // $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) && function_exists("bindtextdomain")) {
+                  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"]);
+                  }
+               }
+               
                ?>
                   <html>
                      <body bgcolor=ffffff>
@@ -120,7 +160,7 @@
                session_destroy();
                exit;
             } else {
-               echo "Unknown error: $read<br>";
+               printf (_("Unknown error: %s")."<br>", $read);
                exit;
             }
          } else {
@@ -200,6 +240,7 @@
     ******************************************************************************/
    function sqimap_find_displayable_name ($string) {
       $string = " ".trim($string);
+      $orig_string = $string;
       if (strpos($string, "<") && strpos($string, ">")) {
          if (strpos($string, "<") == 1) {
             $string = sqimap_find_email($string);
@@ -208,12 +249,15 @@
             $string = substr($string, 0, strpos($string, "<"));
             $string = ereg_replace ("\"", "", $string);   
          }   
+
+         if (trim($string) == "") {
+            $string = sqimap_find_email($orig_string);
+         }
       }
       return $string; 
    }
 
 
-   
    /******************************************************************************
     **  Returns the number of unseen messages in this folder 
     ******************************************************************************/