-<?
+<?php
/** smtp.php
**
** This contains all the functions needed to send messages through
$filetype = "application/octet-stream";
$header = "--".mimeBoundary()."\r\n";
- $header .= "Content-Type: $filetype\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);
}
/* Print all the needed RFC822 headers */
- function write822Header ($fp, $t, $c, $b, $subject) {
+ function write822Header ($fp, $t, $c, $b, $subject, $more_headers) {
global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
global $data_dir, $username, $domain, $version, $useSendmail;
+ global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR;
+ global $REMOTE_HOST;
// Storing the header to make sure the header is the same
// everytime the header is printed.
$cc_list = getLineOfAddrs($cc);
$bcc_list = getLineOfAddrs($bcc);
+ /* Encoding 8-bit characters and making from line */
+ $subject = encodeHeader($subject);
if ($from == "")
$from = "<$from_addr>";
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";
$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
}
$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=\"";
$header .= mimeBoundary();
$header .= "\"\r\n";
} else {
- $header .= "Content-Type: text/plain; charset=ISO-8859-1\r\n";
+ 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
// Send the body
function writeBody ($fp, $passedBody) {
+ global $default_charset;
+
$attachmentlength = 0;
if (isMultipart()) {
$body = "--".mimeBoundary()."\r\n";
- $body .= "Content-Type: text/plain; charset=iso-8859-1\r\n";
+
+ if ($default_charset != "")
+ $body .= "Content-Type: text/plain; charset=$default_charset\r\n";
+ else
+ $body .= "Content-Type: text/plain\r\n";
+
$body .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
$body .= stripslashes($passedBody) . "\r\n";
fputs ($fp, $body);
- $attachmentlenght = attachFiles($fp);
+ $attachmentlength = attachFiles($fp);
$postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n";
fputs ($fp, $postbody);
}
// 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) {
}
}
- 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);
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
$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
function errorCheck($line) {
+ global $color;
// Status: 0 = fatal
// 5 = ok
}
if ($status == 0) {
- echo "<HTML><BODY BGCOLOR=FFFFFF>";
+ echo "<HTML><BODY BGCOLOR=#ffffff>";
echo "<TT>";
echo "<BR><B>ERROR</B><BR><BR>";
echo " <B>Error Number: </B>$err_num<BR>";
return $err_num;
}
- function sendMessage($t, $c, $b, $subject, $body) {
- global $useSendmail;
- global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress;
-
+ 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);
}
-
- // This is a proposed interface to save messages in the sent folder
- // -- gustavf
- //
- // $imap_stream = sqimap_login($username, $key, $imapServerAddress, 1);
- // sqimap_append ($imap_stream, $sent_folder, $length);
- // write822Header ($imap_stream, .....);
- // writeBody ($imap_stream, ....);
- // sqimap_append_done($imap_stream);
- //
- // Or something like that...
-
+ 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();
-
}
-
?>
projects / squirrelmail.git / blobdiff