X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fsmtp.php;h=f8c3fdbbe845a4cacfbc3415e70afa78fa4804bb;hp=89a52b1289f16d65b3244cbea92e3be20de0d04a;hb=2d4e0c66770ff89e362dcb550ce9b2fc7efeb00d;hpb=ca92c4968ff8c2f74326c433db3944cec14fa6e3 diff --git a/functions/smtp.php b/functions/smtp.php index 89a52b12..f8c3fdbb 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -1,4 +1,4 @@ -"; + else + $from = "\"" . encodeHeader($from) . "\" <$from_addr>"; + + /* 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() . ".squirrel@" . $SERVER_NAME .">"; + + /* Make an RFC822 Received: line */ + if (isset($REMOTE_HOST)) + $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])"; + else + $received_from = $REMOTE_ADDR; + + if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) { + if ($HTTP_X_FORWARDED_FOR == "") + $HTTP_X_FORWARDED_FOR = "unknown"; + $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)"; + } + + $header = "Received: from $received_from\r\n"; + $header .= " (SquirrelMail authenticated user $username)\r\n"; + $header .= " by $SERVER_NAME with HTTP;\r\n"; + $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 + + /* Insert headers from the $more_headers array */ + if(is_array($more_headers)) { + reset($more_headers); + while(list($h_name, $h_val) = each($more_headers)) { + $header .= sprintf("%s: %s\r\n", $h_name, $h_val); + } + } + + 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\n"); - fputs ($fp, "Subject: $subject\n"); // Subject - fputs ($fp, "From: $from\n"); // Subject - fputs ($fp, "To: $to_list\n"); // Who it's TO + return $headerlength; + } - if ($cc_list) { - fputs($fp, "Cc: $cc_list\n"); // Who the CCs are - } + // Send the body + function writeBody ($fp, $passedBody) { + global $default_charset; - if ($reply_to != "") - fputs($fp, "Reply-To: $reply_to\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\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)\n"); // Identify SquirrelMail + $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n"; + $body .= sqStripSlashes($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, "\"\n"); + $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n"; + fputs ($fp, $postbody); } else { - fputs($fp, "Content-Type: text/plain; charset=ISO-8859-1\n"); - fputs($fp, "Content-Transfer-Encoding: 8bit\n"); + $body = sqStripSlashes($passedBody) . "\r\n"; + fputs ($fp, $body); + $postbody = "\r\n"; + fputs ($fp, $postbody); } - fputs ($fp, "\n"); - } - // Send the body - function writeBody ($fp, $body) { - if (isMultipart()) { - fputs ($fp, "--".mimeBoundary()."\n"); - fputs ($fp, "Content-Type: text/plain; charset=ISO-8859-1\n"); - fputs ($fp, "Content-Transfer-Encoding: 8bit\n\n"); - fputs ($fp, stripslashes($body) . "\n"); - attachFiles($fp); - fputs ($fp, "\n--".mimeBoundary()."--\n"); - } else { - fputs ($fp, stripslashes($body) . "\n"); - } - fputs ($fp, "\n"); + return (strlen($body) + strlen($postbody) + $attachmentlength); } // Send mail using the sendmail command - function sendSendmail($t, $c, $b, $subject, $body) { + function sendSendmail($t, $c, $b, $subject, $body, $more_headers) { 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, $more_headers); + $bodylength = writeBody($fp, $body); pclose($fp); + + return ($headerlength + $bodylength); } function smtpReadData($smtpConnection) { @@ -186,17 +276,44 @@ } } - function sendSMTP($t, $c, $b, $subject, $body) { + function sendSMTP($t, $c, $b, $subject, $body, $more_headers) { global $username, $domain, $version, $smtpServerAddress, $smtpPort, - $data_dir; + $data_dir, $color; $to = parseAddrs($t); $cc = parseAddrs($c); $bcc = parseAddrs($b); $from_addr = getPref($data_dir, $username, "email_address"); - if ($from_addr == "") - $from_addr = "$username@$domain"; + + /* + * A patch from Bill Thousand + * + * "I don't know if anyone else needs this or not, but it totally makes squirrelmail usable for us. + * This quick patch checks the username and from address for the domain information. We use + * a virtual domain patch for our imap server that allows multiple domains by using username@domain.com + * as the login username." + */ + if ($from_addr == "") { + if (strstr($username, "@")) { + $from_addr = $username; + $address_pieces = explode("@",$username); + $domain = $address_pieces[1]; + } else { + $from_addr = "$username@$domain"; + } + } else { + // If the From Address is specified, use the domain in the from + // address if it's there. + if (strstr($from_addr, "@")) { + $address_pieces = explode("@", $from_addr); + $domain = $address_pieces[1]; + } + } + /* + * End patch from Bill Thousand + */ + $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString); if (!$smtpConnection) { @@ -204,62 +321,78 @@ echo "$errorNumber : $errorString
"; exit; } - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); $to_list = getLineOfAddrs($to); $cc_list = getLineOfAddrs($cc); /** Lets introduce ourselves */ - fputs($smtpConnection, "HELO $domain\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "HELO $domain\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); /** Ok, who is sending the message? */ - fputs($smtpConnection, "MAIL FROM:<$from_addr>\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "MAIL FROM:<$from_addr>\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); /** send who the recipients are */ for ($i = 0; $i < count($to); $i++) { - fputs($smtpConnection, "RCPT TO:<$to[$i]>\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "RCPT TO:<$to[$i]>\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } for ($i = 0; $i < count($cc); $i++) { - fputs($smtpConnection, "RCPT TO:<$cc[$i]>\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "RCPT TO:<$cc[$i]>\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } for ($i = 0; $i < count($bcc); $i++) { - fputs($smtpConnection, "RCPT TO:<$bcc[$i]>\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "RCPT TO:<$bcc[$i]>\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } /** Lets start sending the actual message */ - fputs($smtpConnection, "DATA\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + fputs($smtpConnection, "DATA\r\n"); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); - write822Header ($smtpConnection, $t, $c, $b, $subject); + // Send the message + $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers); + $bodylength = writeBody($smtpConnection, $body); - writeBody($smtpConnection, $body); // send the body of the message - - fputs($smtpConnection, ".\n"); // end the DATA part - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - $num = errorCheck($tmp); + fputs($smtpConnection, ".\r\n"); // end the DATA part + $tmp = fgets($smtpConnection, 1024); + $num = errorCheck($tmp, $smtpConnection); if ($num != 250) { - echo "ERROR
Message not sent!
Reason given: $tmp
"; + $tmp = nl2br(htmlspecialchars($tmp)); + echo "ERROR
Message not sent!
Reason given: $tmp
"; } - fputs($smtpConnection, "QUIT\n"); // log off + fputs($smtpConnection, "QUIT\r\n"); // log off fclose($smtpConnection); + + return ($headerlength + $bodylength); } - function errorCheck($line) { + function errorCheck($line, $smtpConnection) { + global $page_header_php; + global $color; + if (!isset($page_header_php)) { + include "../functions/page_header.php"; + } + + // Read new lines on a multiline response + $lines = $line; + while(ereg("^[0-9]+-", $line)) { + $line = fgets($smtpConnection, 1024); + $lines .= $line; + } + // Status: 0 = fatal // 5 = ok @@ -334,19 +467,20 @@ case 554: $message = "Transaction failed"; $status = 0; break; - default: $message = "Unknown response: $line"; + default: $message = "Unknown response: ". nl2br(htmlspecialchars($lines)); $status = 0; $error_num = "001"; break; } if ($status == 0) { - echo ""; + displayPageHeader($color, "None"); echo ""; - echo "
ERROR

"; + echo "
ERROR

"; echo "   Error Number: $err_num
"; echo "         Reason: $message
"; - echo "Server Response: $line
"; + $lines = nl2br(htmlspecialchars($lines)); + echo "Server Response: $lines
"; echo "
MAIL NOT SENT"; echo ""; exit; @@ -354,15 +488,43 @@ return $err_num; } - function sendMessage($t, $c, $b, $subject, $body) { - global $useSendmail; - + function sendMessage($t, $c, $b, $subject, $body, $reply_id) { + global $useSendmail, $msg_id, $is_reply, $mailbox; + global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort; + $more_headers = Array(); + + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); + + if ($reply_id) { + sqimap_mailbox_select ($imap_stream, $mailbox); + sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, "Answered"); + + // Insert In-Reply-To and References headers if the + // message-id of the message we reply to is set (longer than "<>") + // The References header should really be the old Referenced header + // with the message ID appended, but it can be only the message ID too. + $hdr = sqimap_get_small_header ($imap_stream, $reply_id, false); + if(strlen($hdr->message_id) > 2) { + $more_headers["In-Reply-To"] = $hdr->message_id; + $more_headers["References"] = $hdr->message_id; + } + sqimap_mailbox_close($imap_stream); + } + if ($useSendmail==true) { - sendSendmail($t, $c, $b, $subject, $body); + $length = sendSendmail($t, $c, $b, $subject, $body, $more_headers); } else { - sendSMTP($t, $c, $b, $subject, $body); + $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers); } - - } + if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) { + sqimap_append ($imap_stream, $sent_folder, $length); + write822Header ($imap_stream, $t, $c, $b, $subject, $more_headers); + writeBody ($imap_stream, $body); + sqimap_append_done ($imap_stream); + } + sqimap_logout($imap_stream); + // Delete the files uploaded for attaching (if any). + deleteAttachments(); + } ?>