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

diff --git a/functions/smtp.php b/functions/smtp.php
index 8ddce949..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
@@ -21,37 +21,62 @@
    function attachFiles ($fp) {
       global $attachments, $attachment_dir;
 
-      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";
-
-         fputs ($fp, "--".mimeBoundary()."\r\n");
-         fputs ($fp, "Content-Type: $filetype\n");
-         fputs ($fp, "Content-Disposition: attachment; filename=\"$remotename\"\r\n");
-         fputs ($fp, "Content-Transfer-Encoding: base64\r\n\r\n");
-
-         $file = fopen ($attachment_dir.$localname, "r");
-         while ($tmp = fread($file, 57))
-            fputs ($fp, chunk_split(base64_encode($tmp)));
-         fclose ($file);
-
-         unlink ($attachment_dir.$localname);
-         unlink ($attachment_dir.$localname.".info");
+      $length = 0;
+
+      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);
+         }
+      }
+
+      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 $mimeBoundaryString, $version, $REMOTE_ADDR, $SERVER_NAME,
-         $REMOTE_PORT;
+      global $version, $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
+
+      static $mimeBoundaryString;
 
       if ($mimeBoundaryString == "") {
          $temp = "SquirrelMail".$version.$REMOTE_ADDR.$SERVER_NAME.
@@ -82,97 +107,142 @@
 
    /* 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.
+      static $header, $headerlength;
+
+      if ($header == "") {
+         $to = parseAddrs($t);
+         $cc = parseAddrs($c);
+         $bcc = parseAddrs($b);
+         $reply_to = getPref($data_dir, $username, "reply_to");
+         $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>";
+
+         /* Encoding 8-bit characters */
+         $subject = encodeHeader($subject);
+         $from = encodeHeader($from);
+         
+         /* 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\r\n";
+         
+         /* 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";
+         $header .= "To: $to_list \r\n";    // Who it's TO
+         
+         if ($cc_list) {
+            $header .= "Cc: $cc_list\r\n"; // Who the CCs are
+         }
+         
+         if ($reply_to != "")
+            $header .= "Reply-To: $reply_to\r\n";
+         
+         if ($useSendmail) {
+            if ($bcc_list) {
+               // BCCs is removed from header by sendmail
+               $header .= "Bcc: $bcc_list\r\n"; 
+            }
+         }
+         
+         $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; // Identify SquirrelMail
+         
+         // Do the MIME-stuff
+         $header .= "MIME-Version: 1.0\r\n";
+         
+         if (isMultipart()) {
+            $header .= "Content-Type: multipart/mixed; boundary=\"";
+            $header .= mimeBoundary();
+            $header .= "\"\r\n";
+         } else {
+            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
 
-      $to = parseAddrs($t);
-      $cc = parseAddrs($c);
-      $bcc = parseAddrs($b);
-      $reply_to = getPref($data_dir, $username, "reply_to");
-      $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>";
-
-      /* This creates an RFC 822 date showing GMT */
-      $date = date("D, j M Y H:i:s ", mktime()) . timezone();
-
-      /* Make an RFC822 Received: line */
-      fputs ($fp, "Received: from $REMOTE_ADDR by $SERVER_NAME with HTTP; ");
-      fputs ($fp, "$date\n");
+         $headerlength = strlen($header);
+      }     
+      
+      // Write the header
+      fputs ($fp, $header);
 
-      /* The rest of the header */
-      fputs ($fp, "Date: $date\r\n");
-      fputs ($fp, "Subject: $subject\r\n"); // Subject
-      fputs ($fp, "From: $from\r\n"); // Subject
-      fputs ($fp, "To: $to_list\r\n");    // Who it's TO
+      return $headerlength;
+   }
 
-      if ($cc_list) {
-         fputs($fp, "Cc: $cc_list\r\n"); // Who the CCs are
-      }
+   // Send the body
+   function writeBody ($fp, $passedBody) {
+      global $default_charset;
 
-      if ($reply_to != "")
-         fputs($fp, "Reply-To: $reply_to\r\n");
+      $attachmentlength = 0;
+      
+      if (isMultipart()) {
+         $body = "--".mimeBoundary()."\r\n";
 
-      if ($useSendmail) {
-         if ($bcc_list) {
-            // BCCs is removed from header by sendmail
-            fputs($fp, "Bcc: $bcc_list\r\n"); 
-         }
-      }
+         if ($default_charset != "")
+            $body .= "Content-Type: text/plain; charset=$default_charset\r\n";
+         else 
+            $body .= "Content-Type: text/plain\r\n";
 
-      fputs($fp, "X-Mailer: SquirrelMail (version $version)\r\n"); // Identify SquirrelMail
+         $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
+         $body .= stripslashes($passedBody) . "\r\n";
+         fputs ($fp, $body);
 
-      // Do the MIME-stuff
-      fputs($fp, "MIME-Version: 1.0\n");
+         $attachmentlength = attachFiles($fp);
 
-      if (isMultipart()) {
-         fputs ($fp, "Content-Type: multipart/mixed; boundary=\"");
-         fputs ($fp, mimeBoundary());
-         fputs ($fp, "\"\r\n");
+         $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n";
+         fputs ($fp, $postbody);
       } else {
-         fputs($fp, "Content-Type: text/plain; charset=ISO-8859-1\r\n");
-         fputs($fp, "Content-Transfer-Encoding: 8bit\r\n");
+         $body = stripslashes($passedBody) . "\r\n";
+         fputs ($fp, $body);
+         $postbody = "\r\n";
+         fputs ($fp, $postbody);
       }
-      fputs ($fp, "\r\n");
-   }
 
-   // Send the body
-   function writeBody ($fp, $body) {
-     if (isMultipart()) {
-        fputs ($fp, "--".mimeBoundary()."\r\n");
-        fputs ($fp, "Content-Type: text/plain; charset=ISO-8859-1\r\n");
-        fputs ($fp, "Content-Transfer-Encoding: 8bit\r\n\r\n");
-        fputs ($fp, stripslashes($body) . "\r\n");
-        attachFiles($fp);
-        fputs ($fp, "\r\n--".mimeBoundary()."--\r\n");
-     } else {
-       fputs ($fp, stripslashes($body) . "\r\n");
-     }
-     fputs ($fp, "\r\n");
+      return (strlen($body) + strlen($postbody) + $attachmentlength);
    }
 
    // Send mail using the sendmail command
    function sendSendmail($t, $c, $b, $subject, $body) {
       global $sendmail_path, $username, $domain;
-      
+
       // open pipe to sendmail
-      $fp = popen (escapeshellcmd("$sendmail_path -odb -oi -t -f$username@$domain"), "w");
+      $fp = popen (escapeshellcmd("$sendmail_path -t -f$username@$domain"), "w");
       
-      write822Header ($fp, $t, $c, $b, $subject);
-      writeBody($fp, $body);
+      $headerlength = write822Header ($fp, $t, $c, $b, $subject);
+      $bodylength = writeBody($fp, $body);
 
       pclose($fp);
+
+      return ($headerlength + $bodylenght);
    }
 
    function smtpReadData($smtpConnection) {
@@ -188,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);
@@ -242,24 +312,27 @@
       $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
       errorCheck($tmp);
 
-      write822Header ($smtpConnection, $t, $c, $b, $subject);
-
-      writeBody($smtpConnection, $body); // send the body of the message
+      // Send the message
+      $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject);
+      $bodylength = writeBody($smtpConnection, $body);
 
       fputs($smtpConnection, ".\r\n"); // end the DATA part
       $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
 
       fclose($smtpConnection);
+
+      return ($headerlength + $bodylength);
    }
 
 
    function errorCheck($line) {
+      global $color;
       // Status:  0 = fatal
       //          5 = ok
 
@@ -341,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>";
@@ -355,17 +428,24 @@
    }
 
    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) {  
-	 sendSendmail($t, $c, $b, $subject, $body);
+         $length = sendSendmail($t, $c, $b, $subject, $body);
       } else {
-	 sendSMTP($t, $c, $b, $subject, $body);
+         $length = 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);    
-   }
 
+      $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();
+   }
 ?>