-<?
+<?php
/** smtp.php
**
** This contains all the functions needed to send messages through
$filetype = "application/octet-stream";
$header = "--".mimeBoundary()."\r\n";
- $header .= "Content-Type: $filetype\n";
+ $header .= "Content-Type: $filetype\r\n";
$header .= "Content-Disposition: attachment; filename=\"$remotename\"\r\n";
$header .= "Content-Transfer-Encoding: base64\r\n\r\n";
fputs ($fp, $header);
$from = "<$from_addr>";
else
$from = $from . " <$from_addr>";
+
+ /* Encoding 8-bit characters */
+ $subject = encodeHeader($subject);
+ $from = encodeHeader($from);
/* This creates an RFC 822 date */
$date = date("D, j M Y H:i:s ", mktime()) . timezone();
/* Make an RFC822 Received: line */
$header = "Received: from $REMOTE_ADDR by $SERVER_NAME with HTTP; ";
- $header .= "$date\n";
+ $header .= "$date\r\n";
/* Insert the rest of the header fields */
$header .= "Message-ID: $message_id\r\n";
$header .= "X-Mailer: SquirrelMail (version $version)\r\n"; // Identify SquirrelMail
// Do the MIME-stuff
- $header .= "MIME-Version: 1.0\n";
+ $header .= "MIME-Version: 1.0\r\n";
if (isMultipart()) {
$header .= "Content-Type: multipart/mixed; boundary=\"";
pclose($fp);
- return ($headerlength + $bodylenght);
+ return ($headerlength + $bodylength);
}
function smtpReadData($smtpConnection) {
function sendSMTP($t, $c, $b, $subject, $body) {
global $username, $domain, $version, $smtpServerAddress, $smtpPort,
- $data_dir;
+ $data_dir, $color;
$to = parseAddrs($t);
$cc = parseAddrs($c);
$tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024)));
$num = errorCheck($tmp);
if ($num != 250) {
- echo "<HTML><BODY BGCOLOR=FFFFFF>ERROR<BR>Message not sent!<BR>Reason given: $tmp<BR></BODY></HTML>";
+ echo "ERROR<BR>Message not sent!<BR>Reason given: $tmp<BR></BODY></HTML>";
}
fputs($smtpConnection, "QUIT\r\n"); // log off
function errorCheck($line) {
+ global $color;
// Status: 0 = fatal
// 5 = ok
}
if ($status == 0) {
- echo "<HTML><BODY BGCOLOR=FFFFFF>";
+ echo "<HTML><BODY BGCOLOR=#ffffff>";
echo "<TT>";
echo "<BR><B>ERROR</B><BR><BR>";
echo " <B>Error Number: </B>$err_num<BR>";
return $err_num;
}
- function sendMessage($t, $c, $b, $subject, $body) {
- global $useSendmail;
+ function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
+ global $useSendmail, $msg_id, $is_reply, $mailbox;
global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
+ $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
+ if ($reply_id) {
+ sqimap_mailbox_select ($imap_stream, $mailbox);
+ sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, "Answered");
+ }
+
if ($useSendmail==true) {
$length = sendSendmail($t, $c, $b, $subject, $body);
} else {
$length = sendSMTP($t, $c, $b, $subject, $body);
}
-
- // This is a proposed interface to save messages in the sent folder
- // -- gustavf
- //
-// $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
-// sqimap_append ($imap_stream, $sent_folder, $length);
-// write822Header ($imap_stream, $t, $c, $b, $subject);
-// writeBody ($imap_stream, $body);
- //sqimap_append_done($imap_stream);
- //
- // Or something like that...
-
+ if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
+ sqimap_append ($imap_stream, $sent_folder, $length);
+ write822Header ($imap_stream, $t, $c, $b, $subject);
+ writeBody ($imap_stream, $body);
+ sqimap_append_done ($imap_stream);
+ }
+
// Delete the files uploaded for attaching (if any).
deleteAttachments();
-
}
-
?>