X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fsmtp.php;h=f8c3fdbbe845a4cacfbc3415e70afa78fa4804bb;hb=2d4e0c66770ff89e362dcb550ce9b2fc7efeb00d;hp=bce1cd62dea3b347534925414102c0989df2e314;hpb=a536380680dc05c49c5875b9d3716b747293606f;p=squirrelmail.git diff --git a/functions/smtp.php b/functions/smtp.php index bce1cd62..f8c3fdbb 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -132,11 +132,11 @@ $bcc_list = getLineOfAddrs($bcc); /* Encoding 8-bit characters and making from line */ - $subject = encodeHeader($subject); + $subject = sqStripSlashes(encodeHeader($subject)); if ($from == "") $from = "<$from_addr>"; else - $from = encodeHeader($from) . " <$from_addr>"; + $from = "\"" . encodeHeader($from) . "\" <$from_addr>"; /* This creates an RFC 822 date */ $date = date("D, j M Y H:i:s ", mktime()) . timezone(); @@ -147,9 +147,9 @@ /* Make an RFC822 Received: line */ if (isset($REMOTE_HOST)) - $received_from = "$REMOTE_HOST ($username@[$REMOTE_ADDR])"; + $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])"; else - $received_from = "$REMOTE_ADDR ($username@[$REMOTE_ADDR])"; + $received_from = $REMOTE_ADDR; if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) { if ($HTTP_X_FORWARDED_FOR == "") @@ -157,9 +157,10 @@ $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)"; } - $header = "Received: from $received_from\r\n"; - $header .= " by $SERVER_NAME with HTTP;\r\n"; - $header .= " $date\r\n"; + $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"; @@ -232,7 +233,7 @@ $body .= "Content-Type: text/plain\r\n"; $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n"; - $body .= stripslashes($passedBody) . "\r\n"; + $body .= sqStripSlashes($passedBody) . "\r\n"; fputs ($fp, $body); $attachmentlength = attachFiles($fp); @@ -240,7 +241,7 @@ $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n"; fputs ($fp, $postbody); } else { - $body = stripslashes($passedBody) . "\r\n"; + $body = sqStripSlashes($passedBody) . "\r\n"; fputs ($fp, $body); $postbody = "\r\n"; fputs ($fp, $postbody); @@ -284,8 +285,35 @@ $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) { @@ -293,52 +321,53 @@ 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\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); /** Ok, who is sending the message? */ fputs($smtpConnection, "MAIL FROM:<$from_addr>\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $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]>\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } for ($i = 0; $i < count($cc); $i++) { fputs($smtpConnection, "RCPT TO:<$cc[$i]>\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } for ($i = 0; $i < count($bcc); $i++) { fputs($smtpConnection, "RCPT TO:<$bcc[$i]>\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); } /** Lets start sending the actual message */ fputs($smtpConnection, "DATA\r\n"); - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + errorCheck($tmp, $smtpConnection); // Send the message $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers); $bodylength = writeBody($smtpConnection, $body); fputs($smtpConnection, ".\r\n"); // end the DATA part - $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); - $num = errorCheck($tmp); + $tmp = fgets($smtpConnection, 1024); + $num = errorCheck($tmp, $smtpConnection); if ($num != 250) { + $tmp = nl2br(htmlspecialchars($tmp)); echo "ERROR
Message not sent!
Reason given: $tmp
"; } @@ -350,8 +379,20 @@ } - 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 @@ -426,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; @@ -457,15 +499,16 @@ 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; - } + // 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) { @@ -480,7 +523,7 @@ writeBody ($imap_stream, $body); sqimap_append_done ($imap_stream); } - + sqimap_logout($imap_stream); // Delete the files uploaded for attaching (if any). deleteAttachments(); }