added many speed improvements

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 26d9107c40d5a96a156279d21d90f5fe2d8d8d61..9e3a514b9bbcdd951dfdf91abb447a01d594b4a3 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  imap.php
     **
@@ -63,28 +63,28 @@
     **  Logs the user into the imap server.  If $hide is set, no error messages
     **  will be displayed.  This function returns the imap connection handle.
     ******************************************************************************/
-   function sqimap_login ($username, $password, $imap_server_address, $hide) {
+   function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
       global $color;
-      $imap_stream = fsockopen ($imap_server_address, 143, &$error_number, &$error_string);
+      $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
       $server_info = fgets ($imap_stream, 1024);
       
       /** Do some error correction **/
       if (!$imap_stream) {
          if (!$hide) {
-            echo "Error connecting to IMAP server: $imap_server_address.<br>\n";
-            echo "$error_number : $error_string<br>\n";
+            echo "Error connecting to IMAP server: $imap_server_address.<br>\r\n";
+            echo "$error_number : $error_string<br>\r\n";
          }
          exit;
       }
 
-      fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\n");
+      fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n");
       $read = fgets ($imap_stream, 1024);
 
       /** If the connection was not successful, lets see why **/
       if (substr($read, 0, 7) != "a001 OK") {
          if (!$hide) {
             if (substr($read, 0, 8) == "a001 BAD") {
-               echo "Bad request: $read<br>\n";
+               echo "Bad request: $read<br>\r\n";
                exit;
             } else if (substr($read, 0, 7) == "a001 NO") {
                ?>
@@ -97,7 +97,7 @@
                               <td bgcolor=dcdcdc>
                                  <font color=cc0000>
                                  <center>
-                                 <? echo _("ERROR") ?>
+                                 <?php echo _("ERROR") ?>
                                  </center>
                                  </font>
                               </td>
@@ -105,8 +105,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"><?php echo _("Click here to try again") ?></a>
                                  </center>
                               </td>
                            </tr>
@@ -114,7 +114,8 @@
                         </center>
                      </body>
                   </html>
-               <?
+               <?php
+               session_destroy();
                exit;
             } else {
                echo "Unknown error: $read<br>";
@@ -135,7 +136,7 @@
     **  Simply logs out the imap session
     ******************************************************************************/
    function sqimap_logout ($imap_stream) {
-      fputs ($imap_stream, "a001 LOGOUT\n");
+      fputs ($imap_stream, "a001 LOGOUT\r\n");
    }
 
 
@@ -144,7 +145,7 @@
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
    function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LIST \"\" *\n");
+      fputs ($imap_stream, ". LSUB \"\" *\r\n");
       $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
       $quote_position = strpos ($read[0], "\"");
       $delim = substr ($read[0], $quote_position+1, 1);
@@ -159,7 +160,7 @@
     **  Gets the number of messages in the current mailbox. 
     ******************************************************************************/
    function sqimap_get_num_messages ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
       for ($i = 0; $i < count($read_ary); $i++) {
          if (substr(trim($read_ary[$i]), -6) == EXISTS) {
@@ -184,7 +185,7 @@
          $string = substr($string, strpos($string, "<")+1);
          $string = substr($string, 0, strpos($string, ">"));
       }
-      return $string; 
+      return trim($string); 
    }
 
    
@@ -196,11 +197,14 @@
     **           becomes:   lkehresman@yahoo.com
     ******************************************************************************/
    function sqimap_find_displayable_name ($string) {
+      $string = " ".trim($string);
       if (strpos($string, "<") && strpos($string, ">")) {
-         if (strpos($string, "<") == 0) {
+         if (strpos($string, "<") == 1) {
             $string = sqimap_find_email($string);
          } else {
+            $string = trim($string);
             $string = substr($string, 0, strpos($string, "<"));
+            $string = ereg_replace ("\"", "", $string);   
          }   
       }
       return $string; 
@@ -212,7 +216,7 @@
     **  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\n");
+      fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
       $unseen = false;
       
@@ -227,4 +231,18 @@
 
       return $unseen;
    }
+ 
+  
+   /******************************************************************************
+    **  Saves a message to a given folder -- used for saving sent messages
+    ******************************************************************************/
+   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);
+   }
 ?>