X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fsmtp.php;h=4c273614e558e85069bcdaf065cf4aee734667b6;hb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;hp=73561ee199cf639a24249f73522e51f66d785aca;hpb=28010579e84f885656823b9f2cfa3d808498caa0;p=squirrelmail.git diff --git a/functions/smtp.php b/functions/smtp.php index 73561ee1..4c273614 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -1,4 +1,4 @@ -"; else - $from = $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(); /* Create a message-id */ $message_id = "<" . $REMOTE_PORT . "." . $REMOTE_ADDR . "."; - $message_id .= time() . "@" . $SERVER_NAME .">"; + $message_id .= time() . ".squirrel@" . $SERVER_NAME .">"; /* Make an RFC822 Received: line */ - $header = "Received: from $REMOTE_ADDR by $SERVER_NAME with HTTP; "; - $header .= "$date\n"; + 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"; @@ -152,7 +168,15 @@ $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 } @@ -170,7 +194,7 @@ $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=\""; @@ -227,18 +251,18 @@ } // 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 -t -f$username@$domain"), "w"); - $headerlength = write822Header ($fp, $t, $c, $b, $subject); + $headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers); $bodylength = writeBody($fp, $body); pclose($fp); - return ($headerlength + $bodylenght); + return ($headerlength + $bodylength); } function smtpReadData($smtpConnection) { @@ -252,7 +276,7 @@ } } - function sendSMTP($t, $c, $b, $subject, $body) { + function sendSMTP($t, $c, $b, $subject, $body, $more_headers) { global $username, $domain, $version, $smtpServerAddress, $smtpPort, $data_dir, $color; @@ -309,7 +333,7 @@ errorCheck($tmp); // Send the message - $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject); + $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers); $bodylength = writeBody($smtpConnection, $body); fputs($smtpConnection, ".\r\n"); // end the DATA part @@ -410,7 +434,7 @@ } if ($status == 0) { - echo ""; + echo ""; echo ""; echo "
ERROR

"; echo "   Error Number: $err_num
"; @@ -423,25 +447,42 @@ 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; + } + } + if ($useSendmail==true) { - $length = sendSendmail($t, $c, $b, $subject, $body); + $length = sendSendmail($t, $c, $b, $subject, $body, $more_headers); } else { - $length = sendSMTP($t, $c, $b, $subject, $body); + $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers); } - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); - sqimap_append ($imap_stream, $sent_folder, $length); - write822Header ($imap_stream, $t, $c, $b, $subject); - writeBody ($imap_stream, $body); - sqimap_append_done ($imap_stream); - + 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(); - } - ?>