Saving of sent messages works..kinda

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@305 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index cfbddba90f570d5540cd3d0ed33a2d4be7969d7d..b91838ce16caa4e223327bbf325444e44c325b44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Version 0.4pre1 -- Development
+------------------------------
+- It doesn't bail out if PHP wasn't compiled with --with-gettext.  
+    It only uses english in this case.
+
+
+
+Version 0.3.1 -- March 13, 2000
+-------------------------------
+- Fixed a bug that didn't allow downloading of attachments
+
 Version 0.3 (final) -- March 10, 2000
 -------------------------------------
 - Fixed bug in smtp.php and made sending RFC complient

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 166d8765b5f58a446a676d9b2371686e759ad5b0..c97bf43ddec03795610d3dba28727ec589569d03 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -71,20 +71,20 @@
       /** 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") {
                ?>
@@ -135,7 +135,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 +144,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, ". LIST \"\" *\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 +159,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) {
@@ -213,7 +213,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;
       
@@ -228,4 +228,48 @@
 
       return $unseen;
    }
+ 
+  
+   /******************************************************************************
+    **  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";
+      $to_list = getLineOfAddrs($to);
+      $cc_list = getLineOfAddrs($cc);
+      $bcc_list = getLineOfAddrs($bcc);
+
+      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_list\r\n";
+      if ($cc_list) {
+         $message .= "Cc: $cc_list\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 .= "$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");
+      echo "a001 APPEND $sent_folder (\\Seen) \{$size}<br>";
+
+      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
+      for ($i = 0; $i < count($read_ary); $i++) {
+         echo $read_ary[$i] . "<BR>";
+      }
+   } 
 ?>

diff --git a/functions/smtp.php b/functions/smtp.php
index 3c64ecf1ad60319c769f2639b8702f6a4ef4cf56..8ddce949201eac2d13e16e9dfc0d52b40cf5eb36 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -356,13 +356,16 @@
 
    function sendMessage($t, $c, $b, $subject, $body) {
       global $useSendmail;
-
+      global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress;
+/*
       if ($useSendmail==true) {  
         sendSendmail($t, $c, $b, $subject, $body);
       } else {
         sendSMTP($t, $c, $b, $subject, $body);
       }
-    
+*/
+      $imap_stream = sqimap_login($username, $key, $imapServerAddress, 1);
+      sqimap_append ($imap_stream, $sent_folder, $body, $t, $c, $b, $subject, $data_dir, $username, $domain, $version);    
    }
 
 ?>

diff --git a/functions/strings.php b/functions/strings.php
index ba2e137612aebc679df0f299decde3be93fd8927..b40510cfd8967685e945131707f1cb20f85d09ad 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -150,4 +150,20 @@
    function replace_escaped_spaces ($string) {
       return str_replace(" ", " ", $string);
    }
+
+   function count_chars($string) {
+      for ($i = 0; $i < strlen($string); $i++) {
+         $ch = substr($string, $i, 1);
+         $size++;
+         if ($ch == "\\") {
+            $i++;   
+            $ch = substr($string, $i, 1);
+            if ($ch == "n")
+               $i--;
+            if ($ch == "r")
+               $i--;
+         }   
+      }   
+      return $size;
+   }
 ?>