X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fsmtp.php;h=d63cea5bd3535eee50eaba82485727ff27f8cde7;hp=09a1a7e4a1e0c311d9fb79256d6edbbed9f28f12;hb=f61de96662fb1e93329d4a78c9edeeafdf508975;hpb=7d50f13ccf44b74fdea5bd26c40482dbf3d422e4 diff --git a/functions/smtp.php b/functions/smtp.php index 09a1a7e4..d63cea5b 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -7,9 +7,13 @@ ** $Id$ **/ - $smtp_php = true; - if (!isset($addressbook_php)) - include('../functions/addressbook.php'); + if (defined('smtp_php')) + return; + define('smtp_php', true); + + include('../functions/addressbook.php'); + + global $username, $popuser, $domain; // This should most probably go to some initialization... if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { @@ -35,8 +39,14 @@ // looks up aliases in the addressbook and expands them to // the full address. + // Adds @$domain if it wasn't in the address book and if it + // doesn't have an @ symbol in it function expandAddrs ($array) { - $abook = addressbook_init(); + 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 = ""; @@ -49,6 +59,8 @@ } else { + if (strpos($array[$i], '@') === false) + $array[$i] .= '@' . $domain; $array[$i] = '<' . $array[$i] . '>'; } } @@ -74,16 +86,34 @@ $info['remotefilename'] . "\"\r\n"; $header .= "Content-Disposition: attachment; filename=\"" . $info['remotefilename'] . "\"\r\n"; - $header .= "Content-Transfer-Encoding: base64\r\n\r\n"; - fputs ($fp, $header); - $length += strlen($header); - $file = fopen ($attachment_dir . $info['localfilename'], '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! :-) + $file = fopen ($attachment_dir . $info['localfilename'], '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); } } @@ -145,7 +175,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. @@ -155,9 +185,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; @@ -322,12 +361,15 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers) { global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort, - $data_dir, $color; + $data_dir, $color, $use_authenticated_smtp, $identity; $to = expandAddrs(parseAddrs($t)); $cc = expandAddrs(parseAddrs($c)); $bcc = expandAddrs(parseAddrs($b)); - $from_addr = getPref($data_dir, $username, 'email_address'); + 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"; @@ -339,42 +381,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); @@ -382,10 +442,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 ("../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 @@ -396,12 +460,9 @@ } - 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'; - } + include '../functions/page_header.php'; // Read new lines on a multiline response $lines = $line; @@ -450,13 +511,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; @@ -492,21 +554,17 @@ if ($status == 0) { displayPageHeader($color, 'None'); - echo ''; - echo "
ERROR

"; - echo "   Error Number: $err_num
"; - echo "         Reason: $message
"; + include ("../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; + global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad; global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort; $more_headers = Array(); @@ -552,7 +610,11 @@ } sqimap_logout($imap_stream); // Delete the files uploaded for attaching (if any). - ClearAttachments(); + // only if $length != 0 (if there was no error) + if ($length) + ClearAttachments(); + + return $length; } ?>