<?php
- /** smtp.php
- **
- ** This contains all the functions needed to send messages through
- ** an smtp server or sendmail.
- **
- ** $Id$
- **/
- if (defined('smtp_php'))
- return;
- define('smtp_php', true);
-
- include('../functions/addressbook.php');
+ /**
+ * smtp.php
+ *
+ * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This contains all the functions needed to send messages through
+ * an smtp server or sendmail.
+ *
+ * $Id$
+ */
+
+ require_once('../functions/addressbook.php');
+ require_once('../functions/plugin.php');
global $username, $popuser, $domain;
if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
$popuser = $usernamedata[1];
$domain = $usernamedata[2];
- unset($usernamedata);
+ unset($usernamedata);
} else {
$popuser = $username;
}
return $array;
}
+
+ // looks up aliases in the addressbook and expands them to
+ // the RFC 821 valid RCPT address. ie <user@example.com>
+ // Adds @$domain if it wasn't in the address book and if it
+ // doesn't have an @ symbol in it
+ function expandRcptAddrs ($array) {
+ global $domain;
+
+ // don't show errors -- kinda critical that we don't see
+ // them here since the redirect won't work if we do show them
+ $abook = addressbook_init(false);
+ for ($i=0; $i < count($array); $i++) {
+ $result = $abook->lookup($array[$i]);
+ $ret = "";
+ if (isset($result['email'])) {
+ $ret = '<'.$result['email'].'>';
+ $array[$i] = $ret;
+ }
+ else
+ {
+ if (strpos($array[$i], '@') === false)
+ $array[$i] .= '@' . $domain;
+ $array[$i] = '<' . $array[$i] . '>';
+ }
+ }
+ return $array;
+ }
+
+
// Attach the files that are due to be attached
function attachFiles ($fp) {
global $attachments, $attachment_dir;
if (isMultipart()) {
foreach ($attachments as $info)
{
-// echo "<pre>Attachment Info:\n";
-// var_dump($info);
-// echo "\n</pre>\n";
if (isset($info['type']))
$filetype = $info['type'];
else
$header .= "Content-Disposition: attachment; filename=\"" .
$info['remotefilename'] . "\"\r\n";
- $file = fopen ($attachment_dir . $info['localfilename'], 'r');
+ // Use 'rb' for NT systems -- read binary
+ // Unix doesn't care -- everything's binary! :-)
+ $file = fopen ($attachment_dir . $info['localfilename'], 'rb');
if (substr($filetype, 0, 5) == 'text/' ||
$filetype == 'message/rfc822') {
$header .= "\r\n";
$tmp = str_replace("\r\n", "\n", $tmp);
$tmp = str_replace("\r", "\n", $tmp);
$tmp = str_replace("\n", "\r\n", $tmp);
- $tmp .= "\r\n";
+ if (feof($fp) && substr($tmp, -2) != "\r\n")
+ $tmp .= "\r\n";
fputs($fp, $tmp);
$length += strlen($tmp);
}
$envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
$envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
- // open pipe to sendmail
- $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w');
-
+ // 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);
$bodylength = writeBody($fp, $body);
}
function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
- global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort,
- $data_dir, $color, $use_authenticated_smtp, $identity;
+ global $username, $popuser, $domain, $version, $smtpServerAddress,
+ $smtpPort, $data_dir, $color, $use_authenticated_smtp, $identity,
+ $key, $onetimepad;
- $to = expandAddrs(parseAddrs($t));
- $cc = expandAddrs(parseAddrs($c));
- $bcc = expandAddrs(parseAddrs($b));
+ $to = expandRcptAddrs(parseAddrs($t));
+ $cc = expandRcptAddrs(parseAddrs($c));
+ $bcc = expandRcptAddrs(parseAddrs($b));
if (isset($identity) && $identity != 'default')
$from_addr = getPref($data_dir, $username, 'email_address' . $identity);
else
$tmp = fgets($smtpConnection, 1024);
if (errorCheck($tmp, $smtpConnection)!=5) 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);
}
if ($num != 250) {
$tmp = nl2br(htmlspecialchars($tmp));
displayPageHeader($color, 'None');
- include ("../functions/display_messages.php");
+ include_once('../functions/display_messages.php');
$msg = "Message not sent!<br>\nReason given: $tmp";
plain_error_message($msg, $color);
return(0);
function errorCheck($line, $smtpConnection, $verbose = false) {
global $color;
- include '../functions/page_header.php';
// Read new lines on a multiline response
$lines = $line;
}
if ($status == 0) {
+ include_once('../functions/page_header.php');
displayPageHeader($color, 'None');
- include ("../functions/display_messages.php");
+ include_once('../functions/display_messages.php');
$lines = nl2br(htmlspecialchars($lines));
$msg = $message . "<br>\nServer replied: $lines";
plain_error_message($msg, $color);
return $err_num;
}
- function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
+ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $prio = 3) {
global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad;
global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
+ global $default_use_priority;
+ global $more_headers;
$more_headers = Array();
+ do_hook("smtp_send");
+
$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
if (isset($reply_id) && $reply_id) {
$more_headers['References'] = $hdr->message_id;
}
}
+ if ($default_use_priority) {
+ $more_headers = array_merge($more_headers, createPriorityHeaders($prio));
+ }
// 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);
+ // 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.
- $body = ereg_replace("\r\n", "\n", $body);
+ // 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 ($useSendmail) {
return $length;
}
+ function createPriorityHeaders($prio) {
+ $prio_headers = Array();
+ $prio_headers["X-Priority"] = $prio;
+
+ switch($prio) {
+ case 1: $prio_headers["Importance"] = "High";
+ $prio_headers["X-MSMail-Priority"] = "High";
+ break;
+
+ case 3: $prio_headers["Importance"] = "Normal";
+ $prio_headers["X-MSMail-Priority"] = "Normal";
+ break;
+
+ case 5:
+ $prio_headers["Importance"] = "Low";
+ $prio_headers["X-MSMail-Priority"] = "Low";
+ break;
+ }
+ return $prio_headers;
+ }
?>
projects / squirrelmail.git / blobdiff