Made MIME much more efficient

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index bf83ab711da9b62b524b268e1d43fffa4507f2fb..2274bc107e80b7169c63f88398d2fe10aed28643 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -16,32 +16,64 @@
       }
    }
 
-   function sendMessage($to, $subject, $body) {
+   function sendMessage($smtpServerAddress, $smtpPort, $username, $domain, $t, $c, $b, $subject, $body, $version) {
+      include("../config/config.php");
+
+      $to = parseAddrs($t);
+      $cc = parseAddrs($c);
+      $bcc = parseAddrs($b);
+      $body = stripslashes($body);
+      $from = "$username@$domain";
+
       echo "<FONT FACE=\"Arial,Helvetica\">";
-      $smtpConnection = fsockopen("10.4.1.1", 25, $errorNumber, $errorString);
+      $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString);
       if (!$smtpConnection) {
          echo "Error connecting to SMTP Server.<br>";
          echo "$errorNumber : $errorString<br>";
          exit;
+      } else {
+         $tmp = fgets($smtpConnection, 1024);
       }
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
 
-      fputs($smtpConnection, "MAIL FROM:<luke@usa.om.org>\n");
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
+      $to_list = getLineOfAddrs($to);
+      $cc_list = getLineOfAddrs($cc);
+
+      /** Lets introduce ourselves */
+      fputs($smtpConnection, "HELO $domain\n");
 
-      fputs($smtpConnection, "RCPT TO:<$to>\n");
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
+      /** Ok, who is sending the message? */
+      fputs($smtpConnection, "MAIL FROM:<$from>\n");
+
+      /** send who the recipients are */
+      for ($i = 0; $i < count($to); $i++) {
+         fputs($smtpConnection, "RCPT TO:<$to[$i]>\n");
+      }
+      for ($i = 0; $i < count($cc); $i++) {
+         fputs($smtpConnection, "RCPT TO:<$cc[$i]>\n");
+      }
+      for ($i = 0; $i < count($bcc); $i++) {
+         fputs($smtpConnection, "RCPT TO:<$bcc[$i]>\n");
+      }
 
+      /** Lets start sending the actual message */
       fputs($smtpConnection, "DATA\n");
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
 
-      fputs($smtpConnection, "Subject: $subject\n");
-      fputs($smtpConnection, "$body\n");
-      fputs($smtpConnection, ".\n");
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
+      fputs($smtpConnection, "Subject: $subject\n"); // Subject
+      fputs($smtpConnection, "From: <$from>\n"); // Subject
+      fputs($smtpConnection, "To: <$to_list>\n");    // Who it's TO
+
+      if ($cc_list) {
+         fputs($smtpConnection, "Cc: <$cc_list>\n"); // Who the CCs are
+      }
+      fputs($smtpConnection, "X-Mailer: SquirrelMail (version $version)\n"); // Identify SquirrelMail
+      fputs($smtpConnection, "Reply-To: $from\n");
+      fputs($smtpConnection, "MIME-Version: 1.0\n");
+      fputs($smtpConnection, "Content-Type: text/plain\n");
+
+      fputs($smtpConnection, "$body\n"); // send the body of the message
 
-      fputs($smtpConnection, "QUIT\n");
-      echo htmlspecialchars(fgets($smtpConnection, 1024)) . "<BR>";
+      fputs($smtpConnection, ".\n"); // end the DATA part
+      fputs($smtpConnection, "QUIT\n"); // log off
       echo "</FONT>";
    }
 ?>
\ No newline at end of file