X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=83ffe7e68fcd607986d4a8fcb2cb5334f9481047;hb=4656211357cb4f494081f6b73235f015994c2e8c;hp=f047f3036d978b60a3ca2ec6f8a8e6b30fb010b0;hpb=2c898a113f1e765b06eb92b09d2a80a30e7036b7;p=squirrelmail.git

diff --git a/functions/imap_general.php b/functions/imap_general.php
index f047f303..83ffe7e6 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  imap.php
     **
@@ -13,15 +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);
+		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);
+			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)));
@@ -37,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;
          }
       }
@@ -64,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;
@@ -84,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>
@@ -97,7 +139,7 @@
                               <td bgcolor=dcdcdc>
                                  <font color=cc0000>
                                  <center>
-                                 <? echo _("ERROR") ?>
+                                 <?php echo _("ERROR") ?>
                                  </center>
                                  </font>
                               </td>
@@ -105,8 +147,8 @@
                            <tr>
                               <td>
                                  <center>
-                                 <? echo _("Unknown user or password incorrect.") ?><br>
-                                 <a href="login.php"><? echo _("Click here to try again") ?></a>
+                                 <?php echo _("Unknown user or password incorrect.") ?><br>
+                                 <a href="login.php" target="_top"><?php echo _("Click here to try again") ?></a>
                                  </center>
                               </td>
                            </tr>
@@ -114,10 +156,11 @@
                         </center>
                      </body>
                   </html>
-               <?
+               <?php
+               session_destroy();
                exit;
             } else {
-               echo "Unknown error: $read<br>";
+               printf (_("Unknown error: %s")."<br>", $read);
                exit;
             }
          } else {
@@ -144,7 +187,7 @@
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
    function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LIST \"\" *\r\n");
+      fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
       $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
       $quote_position = strpos ($read[0], "\"");
       $delim = substr ($read[0], $quote_position+1, 1);
@@ -197,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);
@@ -205,66 +249,39 @@
             $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 
     ******************************************************************************/
-   function sqimap_unseen_messages ($imap_stream, &$num_unseen) {
-      fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
+   function sqimap_unseen_messages ($imap_stream, &$num_unseen, $mailbox) {
+      //fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
+      fputs ($imap_stream, "a001 STATUS \"$mailbox\" (UNSEEN)\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
       $unseen = false;
       
-      if (strlen($read_ary[0]) > 10) {
-         $unseen = true;
-         $ary = explode (" ", $read_ary[0]);
-         $num_unseen = count($ary) - 2;
-      } else {
-         $unseen = false;
-         $num_unseen = 0;
-      }
-
-      return $unseen;
+		$read_ary[0] = trim($read_ary[0]);
+		return substr($read_ary[0], strrpos($read_ary[0], " ")+1, (strlen($read_ary[0]) - strrpos($read_ary[0], " ") - 2)); 
    }
  
   
    /******************************************************************************
     **  Saves a message to a given folder -- used for saving sent messages
     ******************************************************************************/
-   function sqimap_append ($imap_stream, $mailbox, $body, $to, $cc, $bcc, $subject, $data_dir, $username, $domain, $version) {
-      global $sent_folder, $data_dir;
-
-      $from = getPref($data_dir, $username, "full_name");
-      $from_addr = getPref($data_dir, $username, "email_address");
-      if ($from_addr == "")
-         $from_addr = "$username@$domain";
-
-      if ($from == "")
-         $from = "<$from_addr>";
-      else
-         $from = $from . " <$from_addr>";
-
-      $message  = "Date: ".date("D, j M Y H:i:s ", mktime()) . timezone() . "\r\n";
-      $message .= "Subject: ". $subject."\r\n";
-      $message .= "From: ".$from."\r\n";
-      $message .= "To: ".$to."\r\n";
-      if ($cc_list) {
-         $message .= "Cc: ".$cc."\r\n"; // Who the CCs are
-      }
-      $message .= "Content-Type: text/plain; charset=ISO-8859-1\r\n";
-      $message .= "Content-Transfer-Encoding: 8bit\r\n";
-      $message .= "\r\n";
-      $message .= stripslashes($body) . "\r\n";
-      $message .= "\r\n";
-      
-      $size = count_chars($message);
-      fputs ($imap_stream, "a001 APPEND $sent_folder (\\Seen) \{$size}\r\n");
-      fputs ($imap_stream, "$message");
-
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
+   function sqimap_append ($imap_stream, $sent_folder, $length) {
+      fputs ($imap_stream, "a001 APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
+      $tmp = fgets ($imap_stream, 1024);
    } 
+
+   function sqimap_append_done ($imap_stream) {
+      fputs ($imap_stream, "\r\n");
+      $tmp = fgets ($imap_stream, 1024);
+   }
 ?>