sqUnWordWrap($body);
$body_ary = explode("\n", $body);
+ $i = count($body_ary) - 1;
+ while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) {
+ unset($body_ary[$i]);
+ $i --;
+ }
$body = "";
for ($i=0; $i < count($body_ary); $i++) {
if (! $forward_id)
{
- if (preg_match('/^[\s>]+/', $body_ary[$i]))
+ if (ereg('^[\s>]+', $body_ary[$i]))
{
$body_ary[$i] = '>' . $body_ary[$i];
}
$bodyTop .= "\n";
$body = $bodyTop . $body;
}
+
+ $body = ereg_replace('\\\\', '\\\\', $body);
sqimap_mailbox_close($imapConnection);
return;
}
} // 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));
+ 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, $from_htmladdr_search;
+ $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
+ $location_of_buttons;
$subject = sqStripSlashes(decodeHeader($subject));
$reply_subj = decodeHeader($reply_subj);
}
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 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("To:");
}
echo "</td></tr>\n\n";
- 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";
-
+ if ($location_of_buttons == 'between') showComposeButtonRow();
echo " <TR>\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 (htmlspecialchars($body)) . "\n\n-- \n" . htmlspecialchars($signature);
- } else {
- echo (htmlspecialchars($body));
+ echo "\n\n-- \n" . htmlspecialchars($signature);
}
echo "</TEXTAREA><BR>\n";
echo " </TD>\n";
echo " </TR>\n";
- echo " <TR><TD> </TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></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 "</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 () {
echo "<BR><BR><BR><CENTER><B>Message Sent!</B><BR><BR>";
} // 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);
displayPageHeader($color, $mailbox);
+
+ if ($AttachFailure)
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
+
checkInput(true);
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");
+ include ("./addrbook_search_html.php");
} else if (isset($attach)) {
- is_logged_in();
- displayPageHeader($color, $mailbox);
-
- $localfilename = md5($HTTP_POST_FILES['attachfile']['tmp_name'].", ".$HTTP_POST_FILES['attachfile']['name'].", $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
-// $localfilename = $localfilename; // ??
-
- // Put the file in a better place
- // This shouldn't be here... Ondrej Sury <ondrej@sury.cz>
- //$tmp=explode('/',$attachfile);
- //$attachfile=$tmp[count($tmp)-1];
- //$attachfile=ereg_replace('\.{2,}','',$attachfile);
-
- //error_reporting(0); // Rename will produce error output if it fails
- //if (!rename($attachfile, $attachment_dir.$localfilename)) {
- // if (!copy($attachfile, $attachment_dir.$localfilename)) {
- if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
- if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
+ if (saveAttachedFiles())
plain_error_message(_("Could not move/copy file. File not attached"), $color);
- $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, $HTTP_POST_FILES['attachfile']['type']."\n".$HTTP_POST_FILES['attachfile']['name']."\n");
- fclose ($fp);
-
- $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
- }
-
showInputForm();
} else if (isset($do_delete)) {
is_logged_in();
displayPageHeader($color, $mailbox);
while (list($lkey, $localname) = each($delete)) {
- array_splice ($attachments, $lkey, 1);
+ 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