** $Id$
**/
- session_start();
-
- 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("../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");
- if (!isset($auth_php))
- include ("../functions/auth.php");
- if (!isset($plugin_php))
- include ("../functions/plugin.php");
-
- include("../src/load_prefs.php");
+ include('../src/validate.php');
+ include("../functions/imap.php");
+ include("../functions/date.php");
+ include("../functions/mime.php");
+ include("../functions/smtp.php");
+ include("../functions/display_messages.php");
+ include ("../functions/plugin.php");
if (!isset($attachments))
+ {
$attachments = array();
+ session_register('attachments');
+ }
+
// 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;
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('^[ >]+', $body_ary[$i]))
{
$body_ary[$i] = '>' . $body_ary[$i];
}
}
sqWordWrap($body_ary[$i], $editor_size - 1);
$body .= $body_ary[$i] . "\n";
- unset($body_ary[$i]);
+ unset($body_ary[$i]);
}
if ($forward_id)
{
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;
+ $message = sqimap_get_message($imapConnection, $forward_id,
+ $mailbox);
+ }
- $localfilename = md5($filename.", $REMOTE_IP, REMOTE_PORT, $UNIQUE_ID, extra-stuff here");
+ if (count($message->entities) == 0) {
+ if ($message->header->entity_id != $ent_num) {
+ $filename = decodeHeader($message->header->filename);
- // 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);
+ if ($filename == "")
+ $filename = "untitled-".$message->header->entity_id;
- $attachments[$localfilename] = $filename;
+ $localfilename = GenerateRandomString(32, '', 7);
+ while (file_exists($attachment_dir . $localfilename))
+ $localfilename = GenerateRandomString(32, '', 7);
+
+ $newAttachment = array();
+ $newAttachment['localfilename'] = $localfilename;
+ $newAttachment['remotefilename'] = $filename;
+ $newAttachment['type'] = strtolower($message->header->type0 .
+ '/' . $message->header->type1);
+
+ // 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[] = $newAttachment;
+ }
} else {
- for ($i = 0; $i < count($message->entities); $i++) {
+ 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,
- $location_of_buttons;
+ $passed_body, $color, $use_signature, $signature, $prefix_sig,
+ $editor_size, $attachments, $subject, $newmail,
+ $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
+ $from_htmladdr_search, $location_of_buttons, $attachment_dir,
+ $username, $data_dir, $identity;
- $subject = sqStripSlashes(decodeHeader($subject));
+ $subject = decodeHeader($subject);
$reply_subj = decodeHeader($reply_subj);
$forward_subj = decodeHeader($forward_subj);
echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
do_hook("compose_form");
- echo ">\n";
+ echo ">\n";
if ($reply_id) {
echo "<input type=hidden name=reply_id value=$reply_id>\n";
}
if ($location_of_buttons == 'top') showComposeButtonRow();
+ $idents = getPref($data_dir, $username, 'identities');
+ if ($idents != '' && $idents > 1)
+ {
+ echo " <TR>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
+ echo _("From:");
+ echo " </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
+ echo "<select name=identity>\n";
+ echo "<option value=default>" .
+ htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+ $em = getPref($data_dir, $username, 'email_address');
+ if ($em != '')
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ for ($i = 1; $i < $idents; $i ++) {
+ echo '<option value="' . $i . '"';
+ if (isset($identity) && $identity == $i)
+ echo ' SELECTED';
+ echo '>';
+ echo htmlspecialchars(getPref($data_dir, $username, 'full_name' .
+ $i));
+ $em = getPref($data_dir, $username, 'email_address' . $i);
+ if ($em != '')
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ }
+ echo "</select>\n";
+ echo " </TD>\n";
+ echo " </TR>\n";
+ }
echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+ echo " <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
echo _("To:");
- echo " </TD><TD BGCOLOR=\"$color[4]\">\n";
+ echo " </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
printf(" <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
htmlspecialchars($send_to));
echo " </TD>\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";
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 = 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:"))
+ 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]";
printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
htmlspecialchars($forward_subj));
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);
+ if ( $prefix_sig == true )
+ echo "\n\n-- \n" . htmlspecialchars($signature);
+ else
+ echo "\n\n" . htmlspecialchars($signature);
}
echo "</TEXTAREA><BR>\n";
echo " </TD>\n";
echo " value=\"" . _("Add") ."\">\n";
echo " </td>\n";
echo " </tr>\n";
- if (isset($attachments) && count($attachments)>0) {
+ if (count($attachments))
+ {
echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
echo " ";
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";
+ foreach ($attachments as $key => $info) {
+ echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
+ echo $info['remotefilename'] . " - " . $info['type'] . " (";
+ echo show_readable_size(filesize($attachment_dir .
+ $info['localfilename'])) . ")<br>\n";
}
echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\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(\"";
echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
}
echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+ echo "\n ". _("Priority") .":<select name=\"mailprio\">".
+ "\n <option value=1>". _("High") ."</option>".
+ "\n <option value=3 selected>". _("Normal") ."</option>".
+ "\n <option value=5>". _("Low") ."</option>".
+ "\n </select>";
do_hook("compose_button_row");
echo " </TR>\n\n";
}
- function showSentForm () {
- echo "<BR><BR><BR><CENTER><B>Message Sent!</B><BR><BR>";
- echo "You will be automatically forwarded.<BR>If not, <A HREF=\"right_main.php\">click here</A>";
- echo "</CENTER>";
- }
-
function checkInput ($show) {
/** I implemented the $show variable because the error messages
were getting sent before the page header. So, I check once
function saveAttachedFiles() {
global $HTTP_POST_FILES, $attachment_dir, $attachments;
- is_logged_in();
$localfilename = GenerateRandomString(32, '', 7);
-
+ while (file_exists($attachment_dir . $localfilename))
+ $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);
+
+ $newAttachment['localfilename'] = $localfilename;
+ $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
+ $newAttachment['type'] =
+ strtolower($HTTP_POST_FILES['attachfile']['type']);
- $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
- }
- }
+ if ($newAttachment['type'] == "")
+ $newAttachment['type'] = 'application/octet-stream';
- // Workaround for RedHat PHP 4.0.4pl1-3
- // Also for Konq problems?
- if (isset($mailbox)) $mailbox = trim($mailbox);
- if (isset($send_to)) $send_to = trim($send_to);
- if (isset($send_to_cc)) $send_to_cc = trim($send_to_cc);
- if (isset($send_to_bcc)) $send_to_bcc = trim($send_to_bcc);
- if (isset($subject)) $subject = trim($subject);
- if (isset($body)) $body = trim($body);
- if (isset($attachfile)) $attachfile = trim($attachfile);
- // End of workaround
-
+ $attachments[] = $newAttachment;
+ }
+
if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
$mailbox = "INBOX";
- if(isset($send)) {
+ if (isset($send)) {
if (isset($HTTP_POST_FILES['attachfile']) &&
$HTTP_POST_FILES['attachfile']['tmp_name'] &&
$HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
$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");
+ // Set $default_charset to correspond with the user's selection
+ // of language interface.
+ set_my_charset();
+
+ // This is to change all newlines to \n
+ // We'll change them to \r\n later (in the sendMessage function)
+ $body = str_replace("\r\n", "\n", $body);
+ $body = str_replace("\r", "\n", $body);
+
+ // Rewrap $body so that no line is bigger than $editor_size
+ // This should only really kick in the sqWordWrap function
+ // if the browser doesn't support "HARD" as the wrap type
+ // Or, in Opera's case, something goes wrong.
+ $body = explode("\n", $body);
+ $newBody = '';
+ foreach ($body as $line) {
+ $line = rtrim($line);
+ if (strlen($line) <= $editor_size + 1)
+ $newBody .= $line . "\n";
+ else {
+ sqWordWrap($line, $editor_size) . "\n";
+ $newBody .= $line;
+ }
+ }
+ $body = $newBody;
+
+ do_hook("compose_send");
+
+ if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio)) {
+ showInputForm();
+ exit();
+ }
+ 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)
+ if (isset($AttachFailure))
plain_error_message(_("Could not move/copy file. File not attached"), $color);
checkInput(true);
//sqimap_logout($imapConnection);
}
} 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 .= ", ";
- $send_to .= $send_to_search[$i];
- }
-
- for ($i=0; $i < count($send_to_cc_search); $i++) {
- if ($send_to_cc)
- $send_to_cc .= ", ";
- $send_to_cc .= $send_to_cc_search[$i];
+ if (isset($send_to_search) && is_array($send_to_search)) {
+ foreach ($send_to_search as $k => $v) {
+ if (substr($k, 0, 1) == 'T') {
+ if ($send_to)
+ $send_to .= ', ';
+ $send_to .= $v;
+ }
+ elseif (substr($k, 0, 1) == 'C') {
+ if ($send_to_cc)
+ $send_to_cc .= ', ';
+ $send_to_cc .= $v;
+ }
+ elseif (substr($k, 0, 1) == 'B') {
+ if ($send_to_bcc)
+ $send_to_bcc .= ', ';
+ $send_to_bcc .= $v;
+ }
+ }
}
showInputForm();
} else if (isset($html_addr_search)) {
+ if (isset($HTTP_POST_FILES['attachfile']) &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
+ {
+ if (saveAttachedFiles())
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
+ }
// 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");
displayPageHeader($color, $mailbox);
showInputForm();
} else if (isset($do_delete)) {
- is_logged_in();
displayPageHeader($color, $mailbox);
- while (list($lkey, $localname) = each($delete)) {
- unset ($attachments[$localname]);
- unlink ($attachment_dir.$localname);
- unlink ($attachment_dir.$localname.".info");
+ if (isset($delete) && is_array($delete))
+ {
+ foreach($delete as $index)
+ {
+ unlink ($attachment_dir.$attachments[$index]['localfilename']);
+ unset ($attachments[$index]);
+ }
}
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);
+ // This handles the default case as well as the error case
+ // (they had the same code) --> if (isset($smtpErrors))
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapPort, 0);
displayPageHeader($color, $mailbox);
$newmail = true;
-
- if (isset($forward_id) && isset($ent_num)) getAttachments(0);
+
+ ClearAttachments();
+
+ if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
+ getAttachments(0);
newMail();
showInputForm();
sqimap_logout($imapConnection);
}
+
+
+
+
+ function ClearAttachments() {
+ global $attachments, $attachment_dir;
+
+ foreach ($attachments as $info) {
+ if (file_exists($attachment_dir . $info['localfilename'])) {
+ unlink($attachment_dir . $info['localfilename']);
+ }
+ }
+
+ $attachments = array();
+ }
+
?>
projects / squirrelmail.git / blobdiff