X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fsmtp.php;h=830b14ec36e393b2c557df6ae960e386dada297b;hb=4b920601138434546a98d0e3b2150fbc0a8c13b0;hp=1e5395857566865e61ff9e3d1ecd1fac88b96f5a;hpb=7622a2047e17749cd52a8e93f5ca9318e0897720;p=squirrelmail.git diff --git a/functions/smtp.php b/functions/smtp.php index 1e539585..830b14ec 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -12,9 +12,9 @@ * $Id$ */ -require_once('../functions/addressbook.php'); -require_once('../functions/plugin.php'); -require_once('../functions/prefs.php'); +require_once(SM_PATH . 'functions/addressbook.php'); +require_once(SM_PATH . 'functions/plugin.php'); +require_once(SM_PATH . 'functions/prefs.php'); global $username, $popuser, $domain; @@ -36,9 +36,9 @@ function isMultipart ($session) { global $attachments; foreach ($attachments as $info) { - if ($info['session'] == $session) { - return true; - } + if ($info['session'] == $session) { + return true; + } } return false; } @@ -77,7 +77,6 @@ function expandAddrs ($array) { return $array; } - /* looks up aliases in the addressbook and expands them to * the RFC 821 valid RCPT address. ie * Adds @$domain if it wasn't in the address book and if it @@ -110,66 +109,108 @@ function expandRcptAddrs ($array) { /* Attach the files that are due to be attached */ -function attachFiles ($fp, $session) { - global $attachments, $attachment_dir, $username; +function attachFiles ($fp, $session, $rn="\r\n", $checkdot = false) { + global $attachments, $attachment_dir, $username, $languages, $squirrelmail_language; $length = 0; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (isMultipart($session)) { foreach ($attachments as $info) { - if ($info['session'] == $session) { - if (isset($info['type'])) { - $filetype = $info['type']; - } - else { - $filetype = 'application/octet-stream'; - } + if ($info['session'] == $session) { + if (isset($info['type'])) { + $filetype = $info['type']; + } + else { + $filetype = 'application/octet-stream'; + } + + $header = '--' . mimeBoundary() . "$rn"; + if ( isset($info['remotefilename']) + && $info['remotefilename'] != '') { + $remotefilename = $info['remotefilename']; + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + $remotefilename = + $languages[$squirrelmail_language]['XTRA_CODE']('encode', $remotefilename); + } + $header .= "Content-Type: $filetype; name=\"" . + encodeHeader($remotefilename) . "\"$rn"; + $header .= "Content-Disposition: attachment; filename=\"" + . encodeHeader($remotefilename) . "\"$rn"; + } else { + $header .= "Content-Type: $filetype$rn"; + } - $header = '--' . mimeBoundary() . "\r\n"; - if ( isset($info['remotefilename']) && $info['remotefilename'] != '') { - $header .= "Content-Type: $filetype; name=\"" . - $info['remotefilename'] . "\"\r\n"; - $header .= "Content-Disposition: attachment; filename=\"" . - $info['remotefilename'] . "\"\r\n"; - } else { - $header .= "Content-Type: $filetype;\r\n"; - } + + /* Use 'rb' for NT systems -- read binary + * Unix doesn't care -- everything's binary! :-) + */ + + $filename = $hashed_attachment_dir . '/' + . $info['localfilename']; + $file = fopen ($filename, 'rb'); + if (substr($filetype, 0, 5) == 'text/' || + substr($filetype, 0, 8) == 'message/' ) { + $header .= $rn; + if ($fp) { + fputs ($fp, $header); + } + $length += strlen($header); + + if ($checkdot) { + $checkdot_begin=true; + } else { + $checkdot_begin=false; + } + + while ($tmp = fgets($file, 4096)) { + $tmp = str_replace("\r\n", "\n", $tmp); + $tmp = str_replace("\r", "\n", $tmp); + if ($rn == "\r\n"){ + $tmp = str_replace("\n", "\r\n", $tmp); + } + if ($tmp{0} == '.' && $checkdot_begin) { + $tmp = '.' . $tmp; + } + if ($checkdot) { + $tmp = str_replace("\n.","\n..",$tmp); + } + + $tmp_length = strlen($tmp); + if ($tmp_length && $tmp{$tmp_length-1} == "\n" && $checkdot) { + $checkdot_begin = true; + } else { + $checkdot_begin = false; + } + + + if ($fp) { + fputs($fp, $tmp); + } + $length += $tmp_length; + } + if (substr($tmp, $tmp_length - strlen($rn), strlen($rn)) != $rn) { + if ($fp) { + fputs($fp, $rn); + } + $length += strlen($rn); + } - /* Use 'rb' for NT systems -- read binary - * Unix doesn't care -- everything's binary! :-) - */ - - $filename = $hashed_attachment_dir . '/' . $info['localfilename']; - $file = fopen ($filename, 'rb'); - if (substr($filetype, 0, 5) == 'text/' || - substr($filetype, 0, 8) == 'message/' ) { - $header .= "\r\n"; - fputs ($fp, $header); - $length += strlen($header); - while ($tmp = fgets($file, 4096)) { - $tmp = str_replace("\r\n", "\n", $tmp); - $tmp = str_replace("\r", "\n", $tmp); - $tmp = str_replace("\n", "\r\n", $tmp); - if (feof($fp) && substr($tmp, -2) != "\r\n") { - $tmp .= "\r\n"; + } else { + $header .= "Content-Transfer-Encoding: base64" + . "$rn" . "$rn"; + if ($fp) fputs ($fp, $header); + $length += strlen($header); + while ($tmp = fread($file, 570)) { + $encoded = chunk_split(base64_encode($tmp)); + $length += strlen($encoded); + if ($fp) fputs ($fp, $encoded); } - fputs($fp, $tmp); - $length += strlen($tmp); - } - } else { - $header .= "Content-Transfer-Encoding: base64\r\n\r\n"; - fputs ($fp, $header); - $length += strlen($header); - while ($tmp = fread($file, 570)) { - $encoded = chunk_split(base64_encode($tmp)); - $length += strlen($encoded); - fputs ($fp, $encoded); } + fclose ($file); } - fclose ($file); - } } } return $length; @@ -178,21 +219,22 @@ function attachFiles ($fp, $session) { /* Delete files that are uploaded for attaching */ function deleteAttachments($session) { - global $username, $attachments, $attachment_dir; + global $username, $attachments, $attachment_dir, $data_dir; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $rem_attachments = array(); foreach ($attachments as $info) { - if ($info['session'] == $session) { + if ($info['session'] == $session) { $attached_file = "$hashed_attachment_dir/$info[localfilename]"; if (file_exists($attached_file)) { - unlink($attached_file); + unlink($attached_file); } - } else { - $rem_attachments[] = $info; - } + } else { + $rem_attachments[] = $info; + } } $attachments = $rem_attachments; + setPref($data_dir, $username, 'attachments', serialize($attachments)); } /* Return a nice MIME-boundary @@ -203,7 +245,7 @@ function mimeBoundary () { if ( !isset( $mimeBoundaryString ) || $mimeBoundaryString == '') { $mimeBoundaryString = '----=_' . date( 'YmdHis' ) . '_' . - mt_rand( 10000, 99999 ); + mt_rand( 10000, 99999 ); } return $mimeBoundaryString; @@ -230,38 +272,50 @@ function timezone () { $diff_minute = floor (($diff_second-3600*$diff_hour) / 60); $zonename = '('.strftime('%Z').')'; - $result = sprintf ("%s%02d%02d %s", $sign, $diff_hour, $diff_minute, $zonename); + $result = sprintf ("%s%02d%02d %s", $sign, $diff_hour, $diff_minute, + $zonename); return ($result); } /* Print all the needed RFC822 headers */ -function write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session) { - global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT; - global $data_dir, $username, $popuser, $domain, $version, $useSendmail; - global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR; - global $REMOTE_HOST, $identity; - +function write822Header ($fp, $t, $c, $b, $subject, $body, $more_headers, $session, $rn="\r\n") { + global $data_dir, $username, $popuser, $domain, $version, $useSendmail, + $default_charset, $identity, $_SERVER; + /* Storing the header to make sure the header is the same * everytime the header is printed. */ - static $header, $headerlength; + + /* get those globals */ + $REMOTE_ADDR = $_SERVER['REMOTE_ADDR']; + $SERVER_NAME = $_SERVER['SERVER_NAME']; + $REMOTE_PORT = $_SERVER['REMOTE_PORT']; + + if(isset($_SERVER['REMOTE_HOST'])) { + $REMOTE_HOST = $_SERVER['REMOTE_HOST']; + } + if(isset($_SERVER['HTTP_VIA'])) { + $HTTP_VIA = $_SERVER['HTTP_VIA']; + } + if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $HTTP_X_FORWARDED_FOR = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + + static $header, $headerlength, $headerrn; if ($header == '') { + $headerrn = $rn; $to = expandAddrs(parseAddrs($t)); $cc = expandAddrs(parseAddrs($c)); $bcc = expandAddrs(parseAddrs($b)); if (isset($identity) && $identity != 'default') { $reply_to = getPref($data_dir, $username, 'reply_to' . $identity); $from = getPref($data_dir, $username, 'full_name' . $identity); - $from_addr = getPref($data_dir, $username, 'email_address' . $identity); + $from_addr = getFrom(); } else { $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 = $popuser.'@'.$domain; + $from_addr = getFrom(); } $to_list = getLineOfAddrs($to); @@ -299,17 +353,17 @@ function write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session) { $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"; + $header = "Received: from $received_from" . $rn; + $header .= " (SquirrelMail authenticated user $username)" . $rn; + $header .= " by $SERVER_NAME with HTTP;" . $rn; + $header .= " $date" . $rn; /* 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 + $header .= "Message-ID: $message_id" . $rn; + $header .= "Date: $date" . $rn; + $header .= "Subject: $subject" . $rn; + $header .= "From: $from" . $rn; + $header .= "To: $to_list" . $rn; // Who it's TO if (isset($more_headers["Content-Type"])) { $contentType = $more_headers["Content-Type"]; @@ -333,87 +387,128 @@ function write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session) { 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 ($h_name == 'References') { + $h_val = str_replace(' ', "$rn ", $h_val); + } + $header .= sprintf("%s: %s%s", $h_name, $h_val, $rn); } } if ($cc_list) { - $header .= "Cc: $cc_list\r\n"; // Who the CCs are + $header .= "Cc: $cc_list" . $rn; // Who the CCs are } if ($reply_to != '') { - $header .= "Reply-To: $reply_to\r\n"; + $header .= "Reply-To: $reply_to" . $rn; } if ($useSendmail) { if ($bcc_list) { // BCCs is removed from header by sendmail - $header .= "Bcc: $bcc_list\r\n"; + $header .= "Bcc: $bcc_list" . $rn; } } - $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; /* Identify SquirrelMail */ + /* Identify SquirrelMail */ + $header .= "X-Mailer: SquirrelMail (version $version)" . $rn; /* Do the MIME-stuff */ - $header .= "MIME-Version: 1.0\r\n"; + $header .= "MIME-Version: 1.0" . $rn; if (isMultipart($session)) { $header .= 'Content-Type: '.$contentType.' boundary="'; $header .= mimeBoundary(); - $header .= "\"\r\n"; + $header .= "\"$rn"; } else { - $header .= 'Content-Type: '.$contentType."\r\n"; - $header .= "Content-Transfer-Encoding: 8bit\r\n"; + if (strtolower($default_charset) == 'iso-2022-jp') { + if (mb_detect_encoding($body) == 'ASCII') { + $header .= 'Content-Type: text/plain; US-ASCII' . $rn; + $header .= "Content-Transfer-Encoding: 8bit" . $rn; + } else { + $header .= 'Content-Type: '.$contentType . $rn; + $header .= "Content-Transfer-Encoding: 7bit" . $rn; + } + } else { + $header .= 'Content-Type: ' . $contentType . $rn; + $header .= "Content-Transfer-Encoding: 8bit" . $rn; + } } - $header .= "\r\n"; // One blank line to separate header and body + $header .= $rn; // One blank line to separate header and body $headerlength = strlen($header); } + + if ($headerrn != $rn) { + $header = str_replace($headerrn, $rn, $header); + $headerlength = strlen($header); + $headerrn = $rn; + } /* Write the header */ - fputs ($fp, $header); + if ($fp) fputs ($fp, $header); return $headerlength; } /* Send the body */ -function writeBody ($fp, $passedBody, $session) { +function writeBody ($fp, $passedBody, $session, $rn="\r\n", $checkdot = false) { global $default_charset; - + $attachmentlength = 0; if (isMultipart($session)) { - $body = '--'.mimeBoundary()."\r\n"; + $body = '--'.mimeBoundary() . $rn; if ($default_charset != "") { - $body .= "Content-Type: text/plain; charset=$default_charset\r\n"; + $body .= "Content-Type: text/plain; charset=$default_charset".$rn; } else { - $body .= "Content-Type: text/plain\r\n"; + $body .= "Content-Type: text/plain" . $rn; } - $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n"; - $body .= $passedBody . "\r\n\r\n"; - fputs ($fp, $body); + if (strtolower($default_charset) == 'iso-2022-jp') { + if (mb_detect_encoding($passedBody) == 'ASCII') { + $body .= "Content-Transfer-Encoding: 8bit" . $rn . $rn . + $passedBody . $rn . $rn; + } else { + $body .= "Content-Transfer-Encoding: 7bit\r\n\r\n" . + mb_convert_encoding($passedBody, 'JIS') . "\r\n\r\n"; + } + } else { + $body .= "Content-Transfer-Encoding: 8bit" . $rn . $rn . + $passedBody . $rn . $rn; + } + if ($fp) { + fputs ($fp, $body); + } - $attachmentlength = attachFiles($fp, $session); + $attachmentlength = attachFiles($fp, $session, $rn, $checkdot); if (!isset($postbody)) { $postbody = ""; } - $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n"; - fputs ($fp, $postbody); + $postbody .= $rn . "--" . mimeBoundary() . "--" . $rn . $rn; + if ($fp) fputs ($fp, $postbody); } else { - $body = $passedBody . "\r\n"; - fputs ($fp, $body); - $postbody = "\r\n"; - fputs ($fp, $postbody); + if (strtolower($default_charset) == 'iso-2022-jp') { + $body = mb_convert_encoding($passedBody, 'JIS') . $rn; + } else { + $body = $passedBody . $rn; + } + if ($fp) { + fputs ($fp, $body); + } + $postbody = $rn; + if ($fp) { + fputs ($fp, $postbody); + } } return (strlen($body) + strlen($postbody) + $attachmentlength); } + /* Send mail using the sendmail command */ function sendSendmail($t, $c, $b, $subject, $body, $more_headers, $session) { @@ -423,23 +518,27 @@ function sendSendmail($t, $c, $b, $subject, $body, $more_headers, $session) { * spaces or other "weird" chars that would allow a user to * exploit the shell/pipe it is used in. */ - $envelopefrom = "$popuser@$domain"; + $envelopefrom = getFrom(); $envelopefrom = ereg_replace("[[:blank:]]",'', $envelopefrom); $envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom); $envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom); - /* open pipe to sendmail or qmail-inject (qmail-inject doesn't accept -t param) */ + /** + * open pipe to sendmail or qmail-inject + * (qmail-inject doesn't accept -t param) + */ if (strstr($sendmail_path, "qmail-inject")) { $fp = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w"); } else { $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w"); } - $headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session); - $bodylength = writeBody($fp, $body, $session); + $headerlength = write822Header ($fp, $t, $c, $b, $subject, $body, + $more_headers, $session, "\n"); + $bodylength = writeBody($fp, $body, $session, "\n", true); pclose($fp); - + return ($headerlength + $bodylength); } @@ -463,7 +562,8 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session) { $cc = expandRcptAddrs(parseAddrs($c)); $bcc = expandRcptAddrs(parseAddrs($b)); if (isset($identity) && $identity != 'default') { - $from_addr = getPref($data_dir, $username, 'email_address' . $identity); + $from_addr = getPref($data_dir, $username, + 'email_address' . $identity); } else { $from_addr = getPref($data_dir, $username, 'email_address'); @@ -472,8 +572,42 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session) { if (!$from_addr) { $from_addr = "$popuser@$domain"; } + + /* POP3 BEFORE SMTP CODE HERE */ + global $pop_before_smtp; + if (isset($pop_before_smtp) && $pop_before_smtp === true) { + if (!isset($pop_port)) { + $pop_port = 110; + } + if (!isset($pop_server)) { + $pop_server = $smtpServerAddress; /* usually the same host! */ + } + $popConnection = fsockopen($pop_server, $pop_port, $err_no, $err_str); + if (!$popConnection) { + error_log("Error connecting to POP Server ($pop_server:$pop_port)" + . " $err_no : $err_str"); + } else { + $tmp = fgets($popConnection, 1024); /* banner */ + if (!eregi("^\+OK", $tmp, $regs)) { + return(0); + } + fputs($popConnection, "USER $username\r\n"); + $tmp = fgets($popConnection, 1024); + if (!eregi("^\+OK", $tmp, $regs)) { + return(0); + } + fputs($popConnection, 'PASS ' . OneTimePadDecrypt($key, $onetimepad) . "\r\n"); + $tmp = fgets($popConnection, 1024); + if (!eregi("^\+OK", $tmp, $regs)) { + return(0); + } + fputs($popConnection, "QUIT\r\n"); /* log off */ + fclose($popConnection); + } + } - $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, $errorNumber, $errorString); + $smtpConnection = fsockopen($smtpServerAddress, $smtpPort, + $errorNumber, $errorString); if (!$smtpConnection) { echo 'Error connecting to SMTP Server.
'; echo "$errorNumber : $errorString
"; @@ -488,7 +622,8 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session) { $cc_list = getLineOfAddrs($cc); /* Lets introduce ourselves */ - if (! isset ($use_authenticated_smtp) || $use_authenticated_smtp == false) { + if (! isset ($use_authenticated_smtp) + || $use_authenticated_smtp == false) { fputs($smtpConnection, "HELO $domain\r\n"); $tmp = fgets($smtpConnection, 1024); if (errorCheck($tmp, $smtpConnection)!=5) return(0); @@ -509,7 +644,8 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session) { return(0); } - fputs($smtpConnection, base64_encode (OneTimePadDecrypt($key, $onetimepad)) . "\r\n"); + fputs($smtpConnection, base64_encode + (OneTimePadDecrypt($key, $onetimepad)) . "\r\n"); $tmp = fgets($smtpConnection, 1024); if (errorCheck($tmp, $smtpConnection)!=5) { return(0); @@ -554,8 +690,9 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session) { } /* Send the message */ - $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers, $session); - $bodylength = writeBody($smtpConnection, $body, $session); + $headerlength = write822Header ($smtpConnection, $t, $c, $b, + $subject, $body, $more_headers, $session); + $bodylength = writeBody($smtpConnection, $body, $session,"\r\n", true); fputs($smtpConnection, ".\r\n"); /* end the DATA part */ $tmp = fgets($smtpConnection, 1024); @@ -664,14 +801,14 @@ function errorCheck($line, $smtpConnection, $verbose = false) { } if ($status == 0) { - include_once('../functions/page_header.php'); + include_once(SM_PATH . 'functions/page_header.php'); if ($compose_new_win == '1') { compose_Header($color, 'None'); } else { displayPageHeader($color, 'None'); } - include_once('../functions/display_messages.php'); + include_once(SM_PATH . 'functions/display_messages.php'); $lines = nl2br(htmlspecialchars($lines)); $msg = $message . "
\nServer replied: $lines"; plain_error_message($msg, $color); @@ -680,31 +817,93 @@ function errorCheck($line, $smtpConnection, $verbose = false) { return $err_num; } -function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN, $prio = 3, $session) { +/* create new reference header per rfc2822 */ + +function calculate_references($refs, $inreplyto, $old_reply_to) { + + $refer = ""; + for ($i=1;$i') { + $refer .= $ref . ' '; + } + } + $refer = trim($refer); + if (strlen($refer) > 2) { + $refer .= ' ' . $inreplyto; + } + else { + if (!empty($old_reply_to)) { + $refer .= $old_reply_to . ' ' . $inreplyto; + } + else { + $refer .= $inreplyto; + } + } + trim($refer); + return $refer; +} + +function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN, + $prio = 3, $session) { global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad, - $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, - $imapPort, $default_use_priority, $more_headers, $request_mdn, $request_dr; + $data_dir, $username, $domain, $key, $version, $sent_folder, + $imapServerAddress, $imapPort, $default_use_priority, $more_headers, + $request_mdn, $request_dr, $uid_support; $more_headers = Array(); do_hook('smtp_send'); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 1); if (isset($reply_id) && $reply_id) { sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, 'Answered'); + sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, 'Answered', true); /* 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. + * with the message ID appended, and now it is (jmunro) */ - $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; + $sid = sqimap_session_id($uid_support); + $query = "$sid FETCH $reply_id (BODY.PEEK[HEADER.FIELDS (Message-Id In-Reply-To)])\r\n"; + fputs ($imap_stream, $query); + $read = sqimap_read_data($imap_stream, $sid, true, $response, $message); + $message_id = ''; + $in_reply_to = ''; + + foreach ($read as $r) { + if (preg_match("/^message-id:(.*)/iA", $r, $regs)) { + $message_id = trim($regs[1]); + } + if (preg_match("/^in-reply-to:(.*)/iA", $r, $regs)) { + $in_reply_to = trim($regs[1]); + } + } + + if(strlen($message_id) > 2) { + $refs = get_reference_header ($imap_stream, $reply_id); + $inreplyto = $message_id; + $old_reply_to = $in_reply_to; + $refer = calculate_references ($refs, $inreplyto, $old_reply_to); + $more_headers['In-Reply-To'] = $inreplyto; + $more_headers['References'] = $refer; } + } if ($default_use_priority) { $more_headers = array_merge($more_headers, createPriorityHeaders($prio)); @@ -720,33 +919,43 @@ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN, $prio = 3, $s if ( $requestRecipt > 0) { $more_headers = array_merge($more_headers, createReceiptHeaders($requestRecipt)); } - - /* In order to remove the problem of users not able to create - * messages with "." on a blank line, RFC821 has made provision - * in section 4.5.2 (Transparency). - */ - $body = ereg_replace("\n\\.", "\n..", $body); - $body = ereg_replace("^\\.", "..", $body); - - /* this is to catch all plain \n instances and - * replace them with \r\n. All newlines were converted - * into just \n inside the compose.php file. - */ - $body = ereg_replace("\n", "\r\n", $body); - if ($MDN) { $more_headers["Content-Type"] = "multipart/report; ". "report-type=disposition-notification;"; } - + $imap_body = $body; if ($useSendmail) { - $length = sendSendmail($t, $c, $b, $subject, $body, $more_headers, $session); + /* In order to remove the problem of users not able to create + * messages with "." on a blank line, RFC821 has made provision + * in section 4.5.2 (Transparency). + */ + if (($body && $body{0} == '.')) { + $body = '.' . $body; + } + $body = str_replace("\n.","\n..",$body); + $length = sendSendmail($t, $c, $b, $subject, $body, $more_headers, + $session); } else { - $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers, $session); + /* In order to remove the problem of users not able to create + * messages with "." on a blank line, RFC821 has made provision + * in section 4.5.2 (Transparency). + */ + if (($body && $body{0} == '.')) { + $body = '.' . $body; + } + $body = str_replace("\n.","\n..",$body); + $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers, + $session); } if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) { + $body = $imap_body; + $body = ereg_replace("\n", "\r\n", $body); + $headerlength = write822Header (false, $t, $c, $b, $subject, $body, $more_headers, $session, "\r\n"); + $bodylength = writeBody(false, $body, $session, "\r\n"); + $length = $headerlength + $bodylength; sqimap_append ($imap_stream, $sent_folder, $length); - write822Header ($imap_stream, $t, $c, $b, $subject, $more_headers, $session); + write822Header ($imap_stream, $t, $c, $b, $subject, $body, $more_headers, + $session); writeBody ($imap_stream, $body, $session); sqimap_append_done ($imap_stream); } @@ -757,7 +966,6 @@ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $MDN, $prio = 3, $s if ($length) { ClearAttachments($session); } - return $length; } @@ -766,17 +974,16 @@ function createPriorityHeaders($prio) { $prio_headers['X-Priority'] = $prio; switch($prio) { - case 1: $prio_headers['Importance'] = 'High'; - $prio_headers['X-MSMail-Priority'] = 'High'; + case 1: + $prio_headers['Importance'] = 'High'; break; - case 3: $prio_headers['Importance'] = 'Normal'; - $prio_headers['X-MSMail-Priority'] = 'Normal'; + case 3: + $prio_headers['Importance'] = 'Normal'; break; case 5: $prio_headers['Importance'] = 'Low'; - $prio_headers['X-MSMail-Priority'] = 'Low'; break; } return $prio_headers; @@ -784,11 +991,19 @@ function createPriorityHeaders($prio) { function createReceiptHeaders($receipt) { - GLOBAL $data_dir, $username; + GLOBAL $data_dir, $username, $identity, $popuser, $domain; $receipt_headers = Array(); - $from_addr = getPref($data_dir, $username, 'email_address'); - $from = getPref($data_dir, $username, 'full_name'); + if (isset($identity) && $identity != 'default') { + $from = getPref($data_dir, $username, 'full_name' . $identity); + $from_addr = getPref($data_dir, $username, 'email_address' . $identity); + } else { + $from = getPref($data_dir, $username, 'full_name'); + $from_addr = getPref($data_dir, $username, 'email_address'); + } + if ($from_addr == '') { + $from_addr = $popuser.'@'.$domain; + } if ($from == '') { $from = "<$from_addr>"; @@ -813,5 +1028,24 @@ function createReceiptHeaders($receipt) { return $receipt_headers; } +/* Figure out what the 'From:' address is + */ + +function getFrom() { + global $username, $popuser, $domain, $data_dir, $identity; + if (isset($identity) && $identity != 'default') { + $from_addr = getPref($data_dir, $username, + 'email_address' . $identity); + } + else { + $from_addr = getPref($data_dir, $username, 'email_address'); + } + + if (!$from_addr) { + $from_addr = "$popuser@$domain"; + } + return $from_addr; +} + ?>