}
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));
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 '../functions/page_header.php';
displayPageHeader($color, 'None');
include ("../functions/display_messages.php");
$lines = nl2br(htmlspecialchars($lines));
}
// 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) {