** - Start new mail
** - Add an attachment
** - Send mail
+ **
+ ** $Id$
**/
-
+
session_start();
- if (!isset($config_php))
- include("../config/config.php");
if (!isset($strings_php))
include("../functions/strings.php");
+ if (!isset($config_php))
+ include("../config/config.php");
if (!isset($page_header_php))
include("../functions/page_header.php");
if (!isset($imap_php))
include("../src/load_prefs.php");
+ if (!isset($attachments))
+ $attachments = array();
+
// 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, $editor_size;
- $send_to = sqStripSlashes(decodeHeader($send_to));
- $send_to_cc = sqStripSlashes(decodeHeader($send_to_cc));
- $send_to_bcc = sqStripSlashes(decodeHeader($send_to_bcc));
+ $send_to = decodeHeader($send_to);
+ $send_to_cc = decodeHeader($send_to_cc);
+ $send_to_bcc = decodeHeader($send_to_bcc);
if ($forward_id)
$id = $forward_id;
- else if ($reply_id)
+ elseif ($reply_id)
$id = $reply_id;
- if ($id) {
+ if (isset($id)) {
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $id, $mailbox);
$orig_header = $message->header;
} else {
$body = "";
}
-
+
if ($message->header->type1 == "html")
$body = strip_tags($body);
-
+
sqUnWordWrap($body);
$body_ary = explode("\n", $body);
$i = count($body_ary) - 1;
- while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) {
+ while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
unset($body_ary[$i]);
$i --;
}
$body = "";
- for ($i=0; $i < count($body_ary); $i++) {
+ for ($i=0; isset($body_ary[$i]); $i++) {
if (! $forward_id)
{
- if (ereg('^[\s>]+', $body_ary[$i]))
+ if (ereg('^[\\s>]+', $body_ary[$i]))
{
$body_ary[$i] = '>' . $body_ary[$i];
}
}
sqWordWrap($body_ary[$i], $editor_size - 1);
$body .= $body_ary[$i] . "\n";
- $body_ary[$i] = '';
+ unset($body_ary[$i]);
}
if ($forward_id)
{
$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));
+ 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,
$send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
$location_of_buttons;
- $subject = sqStripSlashes(decodeHeader($subject));
+ $subject = 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 "// --></SCRIPT>\n\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";
+ echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
+ do_hook("compose_form");
+ echo ">\n";
if ($reply_id) {
echo "<input type=hidden name=reply_id value=$reply_id>\n";
}
echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
if ($reply_subj) {
$reply_subj = str_replace("\"", "'", $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";
htmlspecialchars($reply_subj));
} else if ($forward_subj) {
$forward_subj = str_replace("\"", "'", $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:") &&
echo " <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
echo " <SMALL><BR></SMALL>"._("Attach:");
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\" SIZE=48 TYPE=\"file\">\n";
echo " <input type=\"submit\" name=\"attach\"";
echo " value=\"" . _("Add") ."\">\n";
}
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(\"";
} // function checkInput()
- if (($mailbox == "") || ($mailbox == "None"))
+ // 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 (!isset($failed) || !$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'];
+ }
+ }
+
+ function SqConvertRussianCharsets(){
+ //
+ // This function is here because Russian Apache is a bastard when it comes to
+ // attachments. The solution is to turn off attachment recoding for multipart
+ // forms and do it manually.
+ // See graf@relhum.org for support.
+ //
+ global $CHARSET, $SOURCE_CHARSET, $send_to, $send_to_cc, $send_to_bcc, $subject, $body;
+ $charset_ary = array("koi8-r" => "k",
+ "windows-1251" => "w",
+ "ibm866" => "a",
+ "ISO-8859-5" => "i");
+ $body = convert_cyr_string($body, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
+ $send_to = convert_cyr_string($send_to, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
+ $send_to_cc = convert_cyr_string($send_to_cc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
+ $send_to_bcc = convert_cyr_string($send_to_bcc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
+ $subject = convert_cyr_string($subject, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
+ } // end SqConvertRussianCharsets()
+
+ // Russian Apache sets $CHARSET. See if this is Russian Apache.
+ // If so, check if the source charset (koi8-r) is different from the
+ // one submitted by the browser. If so, recode the parts of the form
+ // to the needed format so SM can proceed and not mangle the cyrillic
+ // input.
+ // See graf@relhum.org for support.
+ //
+ if ($CHARSET && $CHARSET != $SOURCE_CHARSET) SqConvertRussianCharsets();
+
+ if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
$mailbox = "INBOX";
if(isset($send)) {
- if (checkInput(false)) {
- $urlMailbox = urlencode ($mailbox);
+ if (isset($HTTP_POST_FILES['attachfile']) &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
+ $AttachFailure = saveAttachedFiles();
+ if (checkInput(false) && !isset($AttachFailure)) {
+ $urlMailbox = urlencode (trim($mailbox));
+ if (! isset($reply_id))
+ $reply_id = 0;
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();
//sqimap_logout($imapConnection);
}
- } else if ($html_addr_search_done) {
+ } else if (isset($html_addr_search_done)) {
is_logged_in();
displayPageHeader($color, $mailbox);
- $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)
$send_to .= ", ";
}
showInputForm();
- } else if ($html_addr_search) {
+ } else if (isset($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'];
- }
-
+ displayPageHeader($color, $mailbox);
showInputForm();
} else if (isset($do_delete)) {
is_logged_in();
}
showInputForm();
+ } else if (isset($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 (isset($forward_id) && isset($ent_num)) getAttachments(0);
+
newMail();
showInputForm();
sqimap_logout($imapConnection);
projects / squirrelmail.git / blobdiff