X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fsmtp.php;h=e506373017333a677bbc37e2b1e4581d219471e6;hb=001befaf3f44ad9bc1e381e2600c22794873405a;hp=4c15c2c96f6c2d2cc6f40edd21a0e189d5d3a736;hpb=b4338e6716ea0e3b47ee2d0acd0dd2eaf6ba7290;p=squirrelmail.git diff --git a/functions/smtp.php b/functions/smtp.php index 4c15c2c9..e5063730 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -1,21 +1,44 @@ lookup($array[$i]); $ret = ""; @@ -49,45 +78,93 @@ } else { + if (strpos($array[$i], '@') === false) + $array[$i] .= '@' . $domain; $array[$i] = '<' . $array[$i] . '>'; } } 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 + // 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; + global $attachments, $attachment_dir, $username; $length = 0; + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (isMultipart()) { - reset($attachments); - while (list($localname, $remotename) = each($attachments)) { - // This is to make sure noone is giving a filename in another - // directory - $localname = ereg_replace ("\\/", '', $localname); - - $fileinfo = fopen ($attachment_dir.$localname.'.info', 'r'); - $filetype = fgets ($fileinfo, 8192); - fclose ($fileinfo); - $filetype = trim ($filetype); - if ($filetype=='') + foreach ($attachments as $info) + { + if (isset($info['type'])) + $filetype = $info['type']; + else $filetype = 'application/octet-stream'; $header = '--'.mimeBoundary()."\r\n"; - $header .= "Content-Type: $filetype;name=\"$remotename\"\r\n"; - $header .= "Content-Disposition: attachment; filename=\"$remotename\"\r\n"; - $header .= "Content-Transfer-Encoding: base64\r\n\r\n"; - fputs ($fp, $header); - $length += strlen($header); + $header .= "Content-Type: $filetype; name=\"" . + $info['remotefilename'] . "\"\r\n"; + $header .= "Content-Disposition: attachment; filename=\"" . + $info['remotefilename'] . "\"\r\n"; - $file = fopen ($attachment_dir.$localname, 'r'); - while ($tmp = fread($file, 570)) { - $encoded = chunk_split(base64_encode($tmp)); - $length += strlen($encoded); - fputs ($fp, $encoded); - } + // 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/' || + $filetype == 'message/rfc822') { + $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"; + 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); } } @@ -99,12 +176,14 @@ function deleteAttachments() { global $attachments, $attachment_dir; + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (isMultipart()) { reset($attachments); while (list($localname, $remotename) = each($attachments)) { if (!ereg ("\\/", $localname)) { - unlink ($attachment_dir.$localname); - unlink ($attachment_dir.$localname.'.info'); + $filename = $hashed_attachment_dir . '/' . $localname; + unlink ($filename); + unlink ("$filename.info"); } } } @@ -149,7 +228,7 @@ 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; + global $REMOTE_HOST, $identity; // Storing the header to make sure the header is the same // everytime the header is printed. @@ -159,9 +238,18 @@ $to = expandAddrs(parseAddrs($t)); $cc = expandAddrs(parseAddrs($c)); $bcc = expandAddrs(parseAddrs($b)); - $reply_to = getPref($data_dir, $username, 'reply_to'); - $from = getPref($data_dir, $username, 'full_name'); - $from_addr = getPref($data_dir, $username, 'email_address'); + 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); + } + 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; @@ -302,9 +390,13 @@ $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); @@ -325,13 +417,17 @@ } function sendSMTP($t, $c, $b, $subject, $body, $more_headers) { - global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort, - $data_dir, $color; - - $to = expandAddrs(parseAddrs($t)); - $cc = expandAddrs(parseAddrs($c)); - $bcc = expandAddrs(parseAddrs($b)); - $from_addr = getPref($data_dir, $username, 'email_address'); + global $username, $popuser, $domain, $version, $smtpServerAddress, + $smtpPort, $data_dir, $color, $use_authenticated_smtp, $identity, + $key, $onetimepad; + + $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 + $from_addr = getPref($data_dir, $username, 'email_address'); if (!$from_addr) $from_addr = "$popuser@$domain"; @@ -343,42 +439,60 @@ exit; } $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); $to_list = getLineOfAddrs($to); $cc_list = getLineOfAddrs($cc); /** Lets introduce ourselves */ - fputs($smtpConnection, "HELO $domain\r\n"); - $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + 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); + } else { + fputs($smtpConnection, "EHLO $domain\r\n"); + $tmp = fgets($smtpConnection, 1024); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); + + fputs($smtpConnection, "AUTH LOGIN\r\n"); + $tmp = fgets($smtpConnection, 1024); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); + + fputs($smtpConnection, base64_encode ($username) . "\r\n"); + $tmp = fgets($smtpConnection, 1024); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); + + fputs($smtpConnection, base64_encode (OneTimePadDecrypt($key, $onetimepad)) . "\r\n"); + $tmp = fgets($smtpConnection, 1024); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); + } /** Ok, who is sending the message? */ fputs($smtpConnection, "MAIL FROM: <$from_addr>\r\n"); $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); /** send who the recipients are */ for ($i = 0; $i < count($to); $i++) { fputs($smtpConnection, "RCPT TO: $to[$i]\r\n"); $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); } for ($i = 0; $i < count($cc); $i++) { fputs($smtpConnection, "RCPT TO: $cc[$i]\r\n"); $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); } for ($i = 0; $i < count($bcc); $i++) { fputs($smtpConnection, "RCPT TO: $bcc[$i]\r\n"); $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); } /** Lets start sending the actual message */ fputs($smtpConnection, "DATA\r\n"); $tmp = fgets($smtpConnection, 1024); - errorCheck($tmp, $smtpConnection); + if (errorCheck($tmp, $smtpConnection)!=5) return(0); // Send the message $headerlength = write822Header ($smtpConnection, $t, $c, $b, $subject, $more_headers); @@ -386,10 +500,14 @@ fputs($smtpConnection, ".\r\n"); // end the DATA part $tmp = fgets($smtpConnection, 1024); - $num = errorCheck($tmp, $smtpConnection); + $num = errorCheck($tmp, $smtpConnection, true); if ($num != 250) { - $tmp = nl2br(htmlspecialchars($tmp)); - echo "ERROR
Message not sent!
Reason given: $tmp
"; + $tmp = nl2br(htmlspecialchars($tmp)); + displayPageHeader($color, 'None'); + include_once('../functions/display_messages.php'); + $msg = "Message not sent!
\nReason given: $tmp"; + plain_error_message($msg, $color); + return(0); } fputs($smtpConnection, "QUIT\r\n"); // log off @@ -400,12 +518,8 @@ } - function errorCheck($line, $smtpConnection) { - global $page_header_php; + function errorCheck($line, $smtpConnection, $verbose = false) { global $color; - if (!isset($page_header_php)) { - include '../functions/page_header.php'; - } // Read new lines on a multiline response $lines = $line; @@ -454,13 +568,14 @@ $status = 0; break; - + case 235: return(5); break; case 250: $message = 'Requested mail action okay, completed'; $status = 5; break; case 251: $message = 'User not local; will forward'; $status = 5; break; + case 334: return(5); break; case 450: $message = 'Requested mail action not taken: mailbox unavailable'; $status = 0; break; @@ -495,25 +610,26 @@ } if ($status == 0) { + include_once('../functions/page_header.php'); displayPageHeader($color, 'None'); - echo ''; - echo "
ERROR

"; - echo "   Error Number: $err_num
"; - echo "         Reason: $message
"; + include_once('../functions/display_messages.php'); $lines = nl2br(htmlspecialchars($lines)); - echo "Server Response: $lines
"; - echo '
MAIL NOT SENT'; - echo ''; - exit; + $msg = $message . "
\nServer replied: $lines"; + plain_error_message($msg, $color); } + if (! $verbose) return $status; return $err_num; } - function sendMessage($t, $c, $b, $subject, $body, $reply_id) { - global $useSendmail, $msg_id, $is_reply, $mailbox; + 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) { @@ -530,16 +646,19 @@ $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) { @@ -556,7 +675,31 @@ } sqimap_logout($imap_stream); // Delete the files uploaded for attaching (if any). - deleteAttachments(); + // only if $length != 0 (if there was no error) + if ($length) + ClearAttachments(); + + 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; + } ?>