X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fsmtp.php;h=049b8da20a0bcb3d3d5f6c169fb3e68c836d29a0;hb=62d9ff4d1f893c2f4fc513f984fb5cff4014e316;hp=7cfcba7e3297188fe4ddb1e9e596d9280dbe3c5c;hpb=7b67334ebda8d3c4569c5abee4ea2932007429f9;p=squirrelmail.git

diff --git a/functions/smtp.php b/functions/smtp.php
index 7cfcba7e..049b8da2 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /** smtp.php
     **
     ** This contains all the functions needed to send messages through
@@ -23,40 +23,55 @@
 
       $length = 0;
 
-      while (list($localname, $remotename) = each($attachments)) {
-         // This is to make sure noone is giving a filename in another
-         // directory
-         $localname = ereg_replace ("\\/", "", $localname);
-
-         $fileinfo = fopen ($attachment_dir.$localname.".info", "r");
-         $filetype = fgets ($fileinfo, 8192);
-         fclose ($fileinfo);
-         $filetype = trim ($filetype);
-         if ($filetype=="")
-            $filetype = "application/octet-stream";
-
-         $header = "--".mimeBoundary()."\r\n";
-         $header .= "Content-Type: $filetype\n";
-         $header .= "Content-Disposition: attachment; filename=\"$remotename\"\r\n";
-         $header .= "Content-Transfer-Encoding: base64\r\n\r\n";
-         fputs ($fp, $header);
-         $length += strlen($header);
-
-         $file = fopen ($attachment_dir.$localname, "r");
-         while ($tmp = fread($file, 570)) {
-            $encoded = chunk_split(base64_encode($tmp));
-            $length += strlen($encoded);
-            fputs ($fp, $encoded);
+      if (isMultipart()) {
+         reset($attachments);
+         while (list($localname, $remotename) = each($attachments)) {
+            // This is to make sure noone is giving a filename in another
+            // directory
+            $localname = ereg_replace ("\\/", "", $localname);
+            
+            $fileinfo = fopen ($attachment_dir.$localname.".info", "r");
+            $filetype = fgets ($fileinfo, 8192);
+            fclose ($fileinfo);
+            $filetype = trim ($filetype);
+            if ($filetype=="")
+               $filetype = "application/octet-stream";
+            
+            $header = "--".mimeBoundary()."\r\n";
+            $header .= "Content-Type: $filetype\r\n";
+            $header .= "Content-Disposition: attachment; filename=\"$remotename\"\r\n";
+            $header .= "Content-Transfer-Encoding: base64\r\n\r\n";
+            fputs ($fp, $header);
+            $length += strlen($header);
+            
+            $file = fopen ($attachment_dir.$localname, "r");
+            while ($tmp = fread($file, 570)) {
+               $encoded = chunk_split(base64_encode($tmp));
+               $length += strlen($encoded);
+               fputs ($fp, $encoded);
+            }
+            fclose ($file);
          }
-         fclose ($file);
-
-         unlink ($attachment_dir.$localname);
-         unlink ($attachment_dir.$localname.".info");
       }
 
       return $length;
    }
 
+   // Delete files that are uploaded for attaching
+   function deleteAttachments() {
+      global $attachments, $attachment_dir;
+
+      if (isMultipart()) {
+         reset($attachments);
+         while (list($localname, $remotename) = each($attachments)) {
+            if (!ereg ("\\/", $localname)) {
+               unlink ($attachment_dir.$localname);
+               unlink ($attachment_dir.$localname.".info");
+            }
+         }
+      }
+   }
+
    // Return a nice MIME-boundary
    function mimeBoundary () {
       global $version, $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
@@ -92,8 +107,9 @@
 
    /* Print all the needed RFC822 headers */
    function write822Header ($fp, $t, $c, $b, $subject) {
-      global $REMOTE_ADDR, $SERVER_NAME;
+      global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
       global $data_dir, $username, $domain, $version, $useSendmail;
+      global $default_charset;
 
       // Storing the header to make sure the header is the same
       // everytime the header is printed.
@@ -118,15 +134,24 @@
             $from = "<$from_addr>";
          else
             $from = $from . " <$from_addr>";
+
+         /* Encoding 8-bit characters */
+         $subject = encodeHeader($subject);
+         $from = encodeHeader($from);
          
-         /* This creates an RFC 822 date showing GMT */
+         /* This creates an RFC 822 date */
          $date = date("D, j M Y H:i:s ", mktime()) . timezone();
+
+         /* Create a message-id */
+         $message_id = "<" . $REMOTE_PORT . "." . $REMOTE_ADDR . ".";
+         $message_id .= time() . "@" . $SERVER_NAME .">";
          
          /* Make an RFC822 Received: line */
          $header = "Received: from $REMOTE_ADDR by $SERVER_NAME with HTTP; ";
-         $header .= "$date\n";
+         $header .= "$date\r\n";
          
-         /* The rest of the header */
+         /* Insert the rest of the header fields */
+         $header .= "Message-ID: $message_id\r\n";
          $header .= "Date: $date\r\n";
          $header .= "Subject: $subject\r\n";
          $header .= "From: $from\r\n";
@@ -149,14 +174,17 @@
          $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; // Identify SquirrelMail
          
          // Do the MIME-stuff
-         $header .= "MIME-Version: 1.0\n";
+         $header .= "MIME-Version: 1.0\r\n";
          
          if (isMultipart()) {
             $header .= "Content-Type: multipart/mixed; boundary=\"";
             $header .= mimeBoundary();
             $header .= "\"\r\n";
          } else {
-            $header .= "Content-Type: text/plain; charset=ISO-8859-1\r\n";
+            if ($default_charset != "")
+               $header .= "Content-Type: text/plain; charset=$default_charset\r\n";
+            else
+               $header .= "Content-Type: text/plain;\r\n";
             $header .= "Content-Transfer-Encoding: 8bit\r\n";
          }
          $header .= "\r\n"; // One blank line to separate header and body
@@ -172,16 +200,23 @@
 
    // Send the body
    function writeBody ($fp, $passedBody) {
+      global $default_charset;
+
       $attachmentlength = 0;
       
       if (isMultipart()) {
          $body = "--".mimeBoundary()."\r\n";
-         $body .= "Content-Type: text/plain; charset=iso-8859-1\r\n";
+
+         if ($default_charset != "")
+            $body .= "Content-Type: text/plain; charset=$default_charset\r\n";
+         else 
+            $body .= "Content-Type: text/plain\r\n";
+
          $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
          $body .= stripslashes($passedBody) . "\r\n";
          fputs ($fp, $body);
 
-         $attachmentlenght = attachFiles($fp);
+         $attachmentlength = attachFiles($fp);
 
          $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n";
          fputs ($fp, $postbody);
@@ -223,7 +258,7 @@
 
    function sendSMTP($t, $c, $b, $subject, $body) {
       global $username, $domain, $version, $smtpServerAddress, $smtpPort,
-         $data_dir;
+         $data_dir, $color;
 
       $to = parseAddrs($t);
       $cc = parseAddrs($c);
@@ -285,7 +320,7 @@
       $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
       $num = errorCheck($tmp);
       if ($num != 250) {
-         echo "<HTML><BODY BGCOLOR=FFFFFF>ERROR<BR>Message not sent!<BR>Reason given: $tmp<BR></BODY></HTML>";
+         echo "ERROR<BR>Message not sent!<BR>Reason given: $tmp<BR></BODY></HTML>";
       }
 
       fputs($smtpConnection, "QUIT\r\n"); // log off
@@ -297,6 +332,7 @@
 
 
    function errorCheck($line) {
+      global $color;
       // Status:  0 = fatal
       //          5 = ok
 
@@ -378,7 +414,7 @@
       }
 
       if ($status == 0) {
-         echo "<HTML><BODY BGCOLOR=FFFFFF>";
+         echo "<HTML><BODY BGCOLOR=#ffffff>";
          echo "<TT>";
          echo "<BR><B>ERROR</B><BR><BR>";
          echo "&nbsp;&nbsp;&nbsp;<B>Error Number: </B>$err_num<BR>";
@@ -392,8 +428,8 @@
    }
 
    function sendMessage($t, $c, $b, $subject, $body) {
-      global $useSendmail;
-      global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress;
+      global $useSendmail, $msg_id, $is_reply;
+      global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
 
       if ($useSendmail==true) {  
          $length = sendSendmail($t, $c, $b, $subject, $body);
@@ -401,19 +437,15 @@
          $length = sendSMTP($t, $c, $b, $subject, $body);
       }
 
-      // This is a proposed interface to save messages in the sent folder
-      //  -- gustavf
-      //
-      // $imap_stream = sqimap_login($username, $key, $imapServerAddress, 1);
-      // sqimap_append ($imap_stream, $sent_folder, $length);
-      // write822Header ($imap_stream, .....);
-      // writeBody ($imap_stream, ....);
-      // sqimap_append_done($imap_stream);
-      //
-      // Or something like that... 
-
-      //$imap_stream = sqimap_login($username, $key, $imapServerAddress, 1);
-      //sqimap_append ($imap_stream, $sent_folder, $body, $t, $c, $b, $subject, $data_dir, $username, $domain, $version);    
-   }
+      $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
+      if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
+         sqimap_append ($imap_stream, $sent_folder, $length);
+         write822Header ($imap_stream, $t, $c, $b, $subject);
+         writeBody ($imap_stream, $body); 
+         sqimap_append_done ($imap_stream);
+      }   
 
+      // Delete the files uploaded for attaching (if any).
+      deleteAttachments();
+   }
 ?>