** - Send mail
**/
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
- include("../functions/imap.php");
- include("../functions/mailbox.php");
- include("../functions/date.php");
- include("../functions/mime.php");
- include("../functions/smtp.php");
- include("../functions/display_messages.php");
+ if (!isset($config_php))
+ include("../config/config.php");
+ if (!isset($strings_php))
+ include("../functions/strings.php");
+ if (!isset($page_header_php))
+ include("../functions/page_header.php");
+ if (!isset($imap_php))
+ include("../functions/imap.php");
+ if (!isset($date_php))
+ include("../functions/date.php");
+ if (!isset($mime_php))
+ include("../functions/mime.php");
+ if (!isset($smtp_php))
+ include("../functions/smtp.php");
+ if (!isset($display_messages_php))
+ include("../functions/display_messages.php");
include("../src/load_prefs.php");
echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
displayPageHeader($color, "None");
// This function is used when not sending or adding attachments
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
$reply_id, $send_to, $send_to_cc, $mailbox;
+ $send_to = decodeHeader($send_to);
+ $send_to_cc = decodeHeader($send_to_cc);
+
if ($forward_id) {
- selectMailbox($imapConnection, $mailbox, $numMessages);
- $msg = fetchMessage($imapConnection, $forward_id, $mailbox);
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ $msg = sqimap_get_message($imapConnection, $forward_id, $mailbox);
if (containsType($msg, "text", "html", $ent_num)) {
$body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
}
if ($reply_id) {
- selectMailbox($imapConnection, $mailbox, $numMessages);
- $msg = fetchMessage($imapConnection, $reply_id, $mailbox);
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ $msg = sqimap_get_message($imapConnection, $reply_id, $mailbox);
if (containsType($msg, "text", "html", $ent_num)) {
$body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
}
}
- // Add some decoding information
- $send_to = encodeEmailAddr($send_to);
- // parses the field and returns only the email address
- $send_to = decodeEmailAddr($send_to);
+ $send_to = sqimap_find_email($send_to);
- $send_to = strtolower($send_to);
$send_to = ereg_replace("\"", "", $send_to);
$send_to = stripslashes($send_to);
if ($sendcc[$i] == "")
continue;
- $sendcc[$i] = encodeEmailAddr($sendcc[$i]);
- $sendcc[$i] = decodeEmailAddr($sendcc[$i]);
-
- $whofrom = encodeEmailAddr($msg["HEADER"]["FROM"]);
- $whofrom = decodeEmailAddr($whofrom);
-
- $whoreplyto = encodeEmailAddr($msg["HEADER"]["REPLYTO"]);
- $whoreplyto = decodeEmailAddr($whoreplyto);
+ $sendcc[$i] = sqimap_find_email($sendcc[$i]);
+ $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]);
+ $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]);
if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
(strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
function showInputForm () {
global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
$passed_body, $color, $use_signature, $signature, $editor_size,
- $attachments, $subject;
+ $attachments, $subject, $newmail;
+
+ $subject = decodeHeader($subject);
+ $reply_subj = decodeHeader($reply_subj);
+ $forward_subj = decodeHeader($forward_subj);
echo "\n<FORM action=\"compose.php\" METHOD=POST\n";
echo "ENCTYPE=\"multipart/form-data\">\n";
echo " <TR>\n";
echo " <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
- if ($use_signature == true)
- echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";
+ if ($use_signature == true && $newmail == true)
+ echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n-- \n".$signature."</TEXTAREA><BR>";
else
echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
echo " </TD>\n";
}
} else if (isset($attach)) {
$localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
- $localfilename = $attachment_dir.$localfilename;
+ $localfilename = $localfilename;
// Put the file in a better place
error_reporting(0); // Rename will produce error output if it fails
- if (!rename($attachfile, $localfilename)) {
- if (!copy($attachfile, $localfilename)) {
+ if (!rename($attachfile, $attachment_dir.$localfilename)) {
+ if (!copy($attachfile, $attachment_dir.$localfilename)) {
plain_error_message(_("Could not move/copy file. File not attached"));
+ $failed = true;
}
}
// If it still exists, PHP will remove the original file
- // Write information about the file
- $fp = fopen ($localfilename.".info", "w");
- fputs ($fp, "$attachfile_type\n$attachfile_name\n");
- fclose ($fp);
+ if (!$failed) {
+ // Write information about the file
+ $fp = fopen ($attachment_dir.$localfilename.".info", "w");
+ fputs ($fp, "$attachfile_type\n$attachfile_name\n");
+ fclose ($fp);
- $attachments[$localfilename] = $attachfile_name;
+ $attachments[$localfilename] = $attachfile_name;
+ }
showInputForm();
} else if (isset($do_delete)) {
while (list($key, $localname) = each($delete)) {
- array_splice ($attachments, $localname, 1);
- unlink ($localname);
- unlink ($localname.".info");
+ array_splice ($attachments, $key, 1);
+ unlink ($attachment_dir.$localname);
+ unlink ($attachment_dir.$localname.".info");
}
showInputForm();
} else {
- Newmail();
+ $newmail = true;
+ newMail();
showInputForm();
}
?>
projects / squirrelmail.git / blobdiff