<?php
- /** This code sends a mail.
+ /**
+ ** compose.php
+ **
+ ** Copyright (c) 1999-2000 The SquirrelMail development team
+ ** Licensed under the GNU GPL. For full terms see the file COPYING.
+ **
+ ** This code sends a mail.
**
** There are 3 modes of operation:
** - Start new mail
include("../functions/smtp.php");
if (!isset($display_messages_php))
include("../functions/display_messages.php");
+ if (!isset($auth_php))
+ include ("../functions/auth.php");
+ if (!isset($plugin_php))
+ include ("../functions/plugin.php");
include("../src/load_prefs.php");
// This function is used when not sending or adding attachments
function newMail () {
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
- $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc;
+ $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size;
+
+ $send_to = sqStripSlashes(decodeHeader($send_to));
+ $send_to_cc = sqStripSlashes(decodeHeader($send_to_cc));
+ $send_to_bcc = sqStripSlashes(decodeHeader($send_to_bcc));
+
+ if ($forward_id)
+ $id = $forward_id;
+ elseif ($reply_id)
+ $id = $reply_id;
- $send_to = decodeHeader($send_to);
- $send_to_cc = decodeHeader($send_to_cc);
- if ($forward_id) {
+ if ($id) {
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"]);
- } else if (containsType($msg, "text", "plain", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- }
- // add other primary displaying msg types here
- else {
- // find any type that's displayable
- if (containsType($msg, "text", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- } else if (containsType($msg, "msg", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- } else {
- $body = _("No Message");
- }
+ $message = sqimap_get_message($imapConnection, $id, $mailbox);
+ $orig_header = $message->header;
+ if ($ent_num)
+ $message = getEntity($message, $ent_num);
+
+ if ($message->header->type0 == "text" || $message->header->type1 == "message") {
+ if ($ent_num)
+ $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding);
+ else
+ $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding);
+ } else {
+ $body = "";
}
- $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
+ if ($message->header->type1 == "html")
+ $body = strip_tags($body);
- $tmp = _("-------- Original Message ---------\n");
+ sqUnWordWrap($body);
$body_ary = explode("\n", $body);
- $body = "";
- for ($i=0;$i < count($body_ary);$i++) {
- if ($type1 == "html")
- $tmp .= strip_tags($body_ary[$i]);
- else
- $tmp .= $body_ary[$i];
- $body = "$body$tmp\n";
- $tmp = "";
- }
- }
-
- if ($reply_id) {
- 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);
- } else if (containsType($msg, "text", "plain", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+ $i = count($body_ary) - 1;
+ while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) {
+ unset($body_ary[$i]);
+ $i --;
}
- // add other primary displaying msg types here
- else {
- // find any type that's displayable
- if (containsType($msg, "text", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- } else if (containsType($msg, "msg", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- } else {
- $body = _("No Message");
+ $body = "";
+ for ($i=0; $i < count($body_ary); $i++) {
+ if (! $forward_id)
+ {
+ if (ereg('^[\s>]+', $body_ary[$i]))
+ {
+ $body_ary[$i] = '>' . $body_ary[$i];
+ }
+ else
+ {
+ $body_ary[$i] = '> ' . $body_ary[$i];
+ }
}
+ sqWordWrap($body_ary[$i], $editor_size - 1);
+ $body .= $body_ary[$i] . "\n";
+ $body_ary[$i] = '';
}
-
- $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
-
- $body_ary = explode("\n", $body);
- $body = "";
- for ($i=0;$i < count($body_ary);$i++) {
- if ($type1 == "html")
- $tmp = strip_tags($body_ary[$i]);
- else
- $tmp = $body_ary[$i];
- $body = "$body> $tmp\n";
+ if ($forward_id)
+ {
+ $bodyTop = "-------- " . _("Original Message") . " --------\n";
+ $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n";
+ $bodyTop .= _("From") . ": " . $orig_header->from . "\n";
+ $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n";
+ if (count($orig_header->to) > 1) {
+ for ($x=1; $x < count($orig_header->to); $x++) {
+ $bodyTop .= " " . $orig_header->to[$x] . "\n";
+ }
+ }
+ $bodyTop .= "\n";
+ $body = $bodyTop . $body;
}
+
+ $body = ereg_replace('\\\\', '\\\\', $body);
+
+ sqimap_mailbox_close($imapConnection);
+ return;
}
-
+
if (!$send_to) {
$send_to = sqimap_find_email($send_to);
}
- $send_to = ereg_replace("\"", "", $send_to);
- $send_to = stripslashes($send_to);
-
/** This formats a CC string if they hit "reply all" **/
if ($send_to_cc != "") {
+ $send_to_cc = ereg_replace( '"[^"]*"', "", $send_to_cc);
$send_to_cc = ereg_replace(";", ",", $send_to_cc);
$sendcc = explode(",", $send_to_cc);
$send_to_cc = "";
}
} // function newMail()
+ function getAttachments($message) {
+ global $mailbox, $attachments, $attachment_dir, $imapConnection,
+ $ent_num, $forward_id;
+
+ if (!$message) {
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ $message = sqimap_get_message($imapConnection, $forward_id, $mailbox); }
+
+ if (!$message->entities) {
+ if ($message->header->entity_id != $ent_num) {
+ $filename = decodeHeader($message->header->filename);
+
+ if ($filename == "")
+ $filename = "untitled-".$message->header->entity_id;
+
+ $localfilename = md5($filename.", $REMOTE_IP, REMOTE_PORT, $UNIQUE_ID, extra-stuff here");
+
+ // Write File Info
+ $fp = fopen ($attachment_dir.$localfilename.".info", "w");
+ fputs ($fp, strtolower($message->header->type0)."/".strtolower($message->header->type1)."\n".$filename."\n");
+ fclose ($fp);
+
+ // Write Attachment to file
+ $fp = fopen ($attachment_dir.$localfilename, "w");
+ fputs ($fp, decodeBody(mime_fetch_body($imapConnection, $forward_id, $message->header->entity_id), $message->header->encoding));
+
+// Don't know why these lines were included
+// fgets($imapConnection, 256);
+// fgets($imapConnection, 256);
+
+ fclose ($fp);
+
+ $attachments[$localfilename] = $filename;
+
+ }
+ } else {
+ for ($i = 0; $i < count($message->entities); $i++) {
+ getAttachments($message->entities[$i]);
+ }
+ }
+ return;
+ }
+
function showInputForm () {
global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
$passed_body, $color, $use_signature, $signature, $editor_size,
$attachments, $subject, $newmail, $use_javascript_addr_book,
- $send_to_bcc, $reply_id, $mailbox;
+ $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
+ $location_of_buttons;
- $subject = decodeHeader($subject);
+ $subject = sqStripSlashes(decodeHeader($subject));
$reply_subj = decodeHeader($reply_subj);
$forward_subj = decodeHeader($forward_subj);
-
+ $body = sqStripSlashes($body);
+
if ($use_javascript_addr_book) {
echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
echo "function open_abook() { \n";
}
echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\">\n";
+ //echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST>\n";
if ($reply_id) {
echo "<input type=hidden name=reply_id value=$reply_id>\n";
- }
- echo "<input type=hidden name=mailbox value=$mailbox>\n";
- echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
+ }
+ printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
+ echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
+
+ if ($location_of_buttons == 'top') showComposeButtonRow();
+
echo " <TR>\n";
- echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("To:");
- echo " </TD><TD colspan=2 WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- if ($send_to)
- echo " <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
- else
- echo " <INPUT TYPE=TEXT NAME=send_to SIZE=60><BR>";
+ echo " </TD><TD BGCOLOR=\"$color[4]\">\n";
+ printf(" <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
+ htmlspecialchars($send_to));
echo " </TD>\n";
echo " </TR>\n";
echo " <TR>\n";
- echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("CC:");
- echo " </TD><TD WIDTH=% colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- if ($send_to_cc)
- echo " <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
- else
- echo " <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60><BR>";
+ echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ printf(" <INPUT TYPE=text NAME=\"send_to_cc\" SIZE=60 VALUE=\"%s\"><BR>\n",
+ htmlspecialchars($send_to_cc));
echo " </TD>\n";
echo " </TR>\n";
echo " <TR>\n";
- echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("BCC:");
- echo " </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- if ($send_to_bcc)
- echo " <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=55><BR>";
- else
- echo " <INPUT TYPE=TEXT NAME=send_to_bcc SIZE=55><BR>";
- echo " </TD>\n";
- echo "<TD width=1% BGCOLOR=\"$color[4]\" ALIGN=Right>";
-
- if ($use_javascript_addr_book) {
- echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
- echo "<input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
- echo "// --></SCRIPT><NOSCRIPT>\n";
- echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
- echo "</NOSCRIPT>\n";
- } else {
- echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
- }
-
+ echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ printf(" <INPUT TYPE=text NAME=\"send_to_bcc\" VALUE=\"%s\" SIZE=60><BR>\n",
+ htmlspecialchars($send_to_bcc));
echo "</TD></TR>\n";
echo " <TR>\n";
- echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("Subject:");
- echo " </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
if ($reply_subj) {
$reply_subj = str_replace("\"", "'", $reply_subj);
- $reply_subj = stripslashes($reply_subj);
+ $reply_subj = sqStripSlashes($reply_subj);
$reply_subj = trim($reply_subj);
if (substr(strtolower($reply_subj), 0, 3) != "re:")
$reply_subj = "Re: $reply_subj";
- echo " <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$reply_subj\">";
+ printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
+ htmlspecialchars($reply_subj));
} else if ($forward_subj) {
$forward_subj = str_replace("\"", "'", $forward_subj);
- $forward_subj = stripslashes($forward_subj);
+ $forward_subj = sqStripSlashes($forward_subj);
$forward_subj = trim($forward_subj);
if ((substr(strtolower($forward_subj), 0, 4) != "fwd:") &&
(substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
(substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
$forward_subj = "[Fwd: $forward_subj]";
- echo " <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$forward_subj\">";
+ printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
+ htmlspecialchars($forward_subj));
} else {
- echo " <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=55>";
+ printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
+ htmlspecialchars($subject));
}
- echo "</td><td align=right>";
- echo "<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
- echo " </TD>\n";
- echo " </TR>\n";
+ echo "</td></tr>\n\n";
+
+ if ($location_of_buttons == 'between') showComposeButtonRow();
echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" COLSPAN=3>\n";
- 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 BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
+ echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
+ echo htmlspecialchars($body);
+ if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
+ echo "\n\n-- \n" . htmlspecialchars($signature);
+ }
+ echo "</TEXTAREA><BR>\n";
echo " </TD>\n";
echo " </TR>\n";
- echo " <TR><TD COLSPAN=3 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
- echo _("Send");
- echo "\"></TD></TR>\n";
+
+ if ($location_of_buttons == 'bottom')
+ showComposeButtonRow();
+ else {
+ echo " <TR><TD> </TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
+ }
// This code is for attachments
echo " <tr>\n";
- echo " <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
echo " <SMALL><BR></SMALL>"._("Attach:");
- echo " </td><td width=% colspan=2 ALIGN=left BGCOLOR=\"$color[0]\">\n";
+ echo " </td><td ALIGN=left BGCOLOR=\"$color[0]\">\n";
// echo " <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
// echo " value=\"10000\">\n";
- echo " <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
- echo " <input type=\"submit\" name=\"attach\"\n";
- echo " value=\"" . _("Add") ."\">\n";
+ echo " <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
+ echo " <input type=\"submit\" name=\"attach\"";
+ echo " value=\"" . _("Add") ."\">\n";
echo " </td>\n";
- echo " </font>\n";
echo " </tr>\n";
if (isset($attachments) && count($attachments)>0) {
- echo "</tr><tr><td width=50 bgcolor=\"$color[0]\" align=right>\n";
+ echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
echo " ";
- echo "</td><td width=% align=left colspan=2 bgcolor=\"$color[0]\">";
+ echo "</td><td align=left bgcolor=\"$color[0]\">";
while (list($localname, $remotename) = each($attachments)) {
echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
echo "</TABLE>\n";
echo "</FORM>";
+ do_hook("compose_bottom");
+ }
+
+ function showComposeButtonRow() {
+ global $use_javascript_addr_book;
+ echo " <TR><td>\n </td><td>\n";
+ if ($use_javascript_addr_book) {
+ echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
+ echo " <input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
+ echo " // --></SCRIPT><NOSCRIPT>\n";
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ echo " </NOSCRIPT>\n";
+ } else {
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ }
+ echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+
+ do_hook("compose_button_row");
+
+ echo " </TD>\n";
+ echo " </TR>\n\n";
}
function showSentForm () {
error message, show=true **/
global $body, $send_to, $subject, $color;
- if ($body == "") {
- if ($show)
- plain_error_message(_("You have not entered a message body."), $color);
- return false;
- } else if ($send_to == "") {
+ if ($send_to == "") {
if ($show)
plain_error_message(_("You have not filled in the \"To:\" field."), $color);
return false;
- } else if ($subject == "") {
- if ($show)
- plain_error_message(_("You have not entered a subject."), $color);
- return false;
}
return true;
} // function checkInput()
+ // True if FAILURE
+ function saveAttachedFiles() {
+ global $HTTP_POST_FILES, $attachment_dir, $attachments;
+
+ is_logged_in();
+ $localfilename = GenerateRandomString(32, '', 7);
+
+ if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
+ if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
+ return true;
+ }
+ }
+
+ if (!$failed) {
+ // Write information about the file
+ $fp = fopen ($attachment_dir.$localfilename.".info", "w");
+ fputs ($fp, $HTTP_POST_FILES['attachfile']['type']."\n".$HTTP_POST_FILES['attachfile']['name']."\n");
+ fclose ($fp);
+
+ $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
+ }
+ }
+
if (($mailbox == "") || ($mailbox == "None"))
$mailbox = "INBOX";
if(isset($send)) {
- if (checkInput(false)) {
+ if ($HTTP_POST_FILES['attachfile']['tmp_name'] &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
+ $AttachFailure = saveAttachedFiles();
+ if (checkInput(false) && ! $AttachFailure) {
$urlMailbox = urlencode ($mailbox);
sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
} else {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
displayPageHeader($color, $mailbox);
+
+ if ($AttachFailure)
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
+
checkInput(true);
showInputForm();
+ //sqimap_logout($imapConnection);
}
} else if ($html_addr_search_done) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ is_logged_in();
displayPageHeader($color, $mailbox);
- $body = stripslashes($body);
- $send_to = stripslashes($send_to);
- $send_to_cc = stripslashes($send_to_cc);
- $send_to_bcc = stripslashes($send_to_bcc);
- $subject = stripslashes($subject);
+ $send_to = sqStripSlashes($send_to);
+ $send_to_cc = sqStripSlashes($send_to_cc);
+ $send_to_bcc = sqStripSlashes($send_to_bcc);
for ($i=0; $i < count($send_to_search); $i++) {
if ($send_to)
showInputForm();
} else if ($html_addr_search) {
- //* I am using an include so as to elminiate an extra unnecessary click. If you
- //* can think of a better way, please implement it.
- include ("addrbook_search_html.php");
+ // I am using an include so as to elminiate an extra unnecessary click. If you
+ // can think of a better way, please implement it.
+ include ("./addrbook_search_html.php");
} else if (isset($attach)) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ if (saveAttachedFiles())
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
displayPageHeader($color, $mailbox);
-
- $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
- $localfilename = $localfilename;
-
- // Put the file in a better place
- error_reporting(0); // Rename will produce error output if it fails
- 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
-
- 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;
- }
-
showInputForm();
} else if (isset($do_delete)) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ is_logged_in();
displayPageHeader($color, $mailbox);
- while (list($key, $localname) = each($delete)) {
- array_splice ($attachments, $key, 1);
+ while (list($lkey, $localname) = each($delete)) {
+ unset ($attachments[$localname]);
unlink ($attachment_dir.$localname);
unlink ($attachment_dir.$localname.".info");
}
showInputForm();
+ } else if ($smtpErrors) {
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ displayPageHeader($color, $mailbox);
+
+ $newmail = true;
+ if ($forward_id && $ent_num) getAttachments(0);
+
+ newMail();
+ showInputForm();
+ sqimap_logout($imapConnection);
} else {
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
displayPageHeader($color, $mailbox);
$newmail = true;
+
+ if ($forward_id && $ent_num) getAttachments(0);
+
newMail();
showInputForm();
+ sqimap_logout($imapConnection);
}
?>
+
+
projects / squirrelmail.git / blobdiff