// 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 = "";
}
else
{
+ if (strpos($array[$i], '@') === false)
+ $array[$i] .= '@' . $domain;
$array[$i] = '<' . $array[$i] . '>';
}
}
$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);
}
}
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.
$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;
function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort,
- $data_dir, $color, $use_authenticated_smtp;
+ $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";
$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);
}
fputs($smtpConnection, ".\r\n"); // end the DATA part
$tmp = fgets($smtpConnection, 1024);
- $num = errorCheck($tmp, $smtpConnection, verbose);
+ $num = errorCheck($tmp, $smtpConnection, true);
if ($num != 250) {
$tmp = nl2br(htmlspecialchars($tmp));
displayPageHeader($color, 'None');
include ("../functions/display_messages.php");
- $lines = nl2br(htmlspecialchars($lines));
$msg = "Message not sent!<br>\nReason given: $tmp";
plain_error_message($msg, $color);
return(0);
}
- function errorCheck($line, $smtpConnection) {
+ function errorCheck($line, $smtpConnection, $verbose = false) {
global $color;
include '../functions/page_header.php';
$msg = $message . "<br>\nServer replied: $lines";
plain_error_message($msg, $color);
}
- if ($verbose == "") return $status;
+ if (! $verbose) return $status;
return $err_num;
}
}
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;
}
?>