$domain = getenv('HOSTNAME');
}
-/**
- * Return which separator we should be using.
- * \r\n for SMTP delivery, just \n for Sendmail.
- */
-function sqm_nrn(){
- global $useSendmail;
- if ($useSendmail){
- return "\n";
- } else {
- return "\r\n";
- }
-}
-
-
/* Returns true only if this message is multipart */
function isMultipart ($session) {
global $attachments;
/* Attach the files that are due to be attached
*/
-function attachFiles ($fp, $session) {
+function attachFiles ($fp, $session, $rn="\r\n") {
global $attachments, $attachment_dir, $username;
$length = 0;
- $rn = sqm_nrn();
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (isMultipart($session)) {
$header .= "Content-Disposition: attachment; filename=\""
. $info['remotefilename'] . "\"$rn";
} else {
- $header .= "Content-Type: $filetype;$rn";
+ $header .= "Content-Type: $filetype$rn";
}
}
/* Print all the needed RFC822 headers */
-function write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session) {
+function write822Header ($fp, $t, $c, $b, $subject, $more_headers, $session, $rn="\r\n") {
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;
- /**
- * Get which delimiter we are going to use.
- */
- $rn = sqm_nrn();
+
/* Storing the header to make sure the header is the same
* everytime the header is printed.
*/
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);
if(is_array($more_headers)) {
reset($more_headers);
while(list($h_name, $h_val) = each($more_headers)) {
+ if ($h_name == 'References') {
+ $h_val = str_replace(' ', "$rn ", $h_val);
+ }
$header .= sprintf("%s: %s%s", $h_name, $h_val, $rn);
}
}
/* Send the body
*/
-function writeBody ($fp, $passedBody, $session) {
+function writeBody ($fp, $passedBody, $session, $rn="\r\n") {
global $default_charset;
- /**
- * Get delimiter.
- */
- $rn = sqm_nrn();
$attachmentlength = 0;
$body .= $passedBody . $rn . $rn;
fputs ($fp, $body);
- $attachmentlength = attachFiles($fp, $session);
+ $attachmentlength = attachFiles($fp, $session, $rn);
if (!isset($postbody)) {
$postbody = "";
* 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);
}
$headerlength = write822Header ($fp, $t, $c, $b, $subject,
- $more_headers, $session);
- $bodylength = writeBody($fp, $body, $session);
+ $more_headers, $session, "\n");
+ $bodylength = writeBody($fp, $body, $session, "\n");
pclose($fp);
-
+
return ($headerlength + $bodylength);
}
/* create new reference header per rfc2822 */
function calculate_references($refs, $inreplyto, $old_reply_to) {
- /**
- * Get the delimiter.
- */
- $rn = sqm_nrn();
+
$refer = "";
for ($i=1;$i<count($refs[0]);$i++) {
if (!empty($refs[0][$i])) {
}
}
trim($refer);
- $refer = str_replace(' ', "$rn ", $refer);
return $refer;
}
$imapServerAddress, $imapPort, $default_use_priority, $more_headers,
$request_mdn, $request_dr;
- /**
- * Get the delimiter.
- */
- $rn = sqm_nrn();
$more_headers = Array();
do_hook('smtp_send');
* The References header should really be the old Referenced header
* 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) {
+ $sid = sqimap_session_id();
+ $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 = $hdr->message_id;
- $old_reply_to = $hdr->inrepto;
+ $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));
* into just \n inside the compose.php file.
* But only if delimiter is, in fact, \r\n.
*/
- if ($rn == "\r\n"){
- $body = ereg_replace("\n", "\r\n", $body);
- }
if ($MDN) {
$more_headers["Content-Type"] = "multipart/report; ".
$length = sendSendmail($t, $c, $b, $subject, $body, $more_headers,
$session);
} else {
+ $body = ereg_replace("\n", "\r\n", $body);
$length = sendSMTP($t, $c, $b, $subject, $body, $more_headers,
$session);
}
if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
+ if ($useSendmail) $body = ereg_replace("\n", "\r\n", $body);
sqimap_append ($imap_stream, $sent_folder, $length);
write822Header ($imap_stream, $t, $c, $b, $subject, $more_headers,
$session);
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>";
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;
+}
+
?>
projects / squirrelmail.git / blobdiff