require_once('../functions/date.php');
require_once('../functions/mime.php');
require_once('../functions/smtp.php');
-require_once('../functions/display_messages.php');
require_once('../functions/plugin.php');
-
+require_once('../functions/display_messages.php');
/* --------------------- Specific Functions ------------------------------ */
+function replyAllString($header) {
+ global $include_self_reply_all, $username, $data_dir;
+ $excl_arr = array();
+ /**
+ * 1) Remove the addresses we'll be sending the message 'to'
+ */
+ $url_replytoall_avoid_addrs = '';
+ if (isset($header->replyto)) {
+ $excl_ar = $header->getAddr_a('replyto');
+ }
+ /**
+ * 2) Remove our identities from the CC list (they still can be in the
+ * TO list) only if $include_self_reply_all is turned off
+ */
+ if (!$include_self_reply_all) {
+ $email_address = trim(getPref($data_dir, $username, 'email_address'));
+ $excl_ar[$email_address] = '';
+
+ $idents = getPref($data_dir, $username, 'identities');
+ if ($idents != '' && $idents > 1) {
+ for ($i = 1; $i < $idents; $i ++) {
+ $cur_email_address = getPref($data_dir, $username,
+ 'email_address' . $i);
+ $cur_email_address = strtolower($cur_email_address);
+ $excl_ar[$cur_email_address] = '';
+ }
+ }
+ }
+
+ /**
+ * 3) get the addresses.
+ */
+ $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar);
+
+ /**
+ * 4) generate the string.
+ */
+ $url_replytoallcc = '';
+ foreach( $url_replytoall_ar as $email => $personal) {
+ if ($personal) {
+ $url_replytoallcc .= ", \"$personal\" <$email>";
+ } else {
+ $url_replytoallcc .= ', '. $email;
+ }
+ }
+ $url_replytoallcc = substr($url_replytoallcc,2);
+ return $url_replytoallcc;
+}
+function getforwardHeader($orig_header) {
+ global $editor_size;
+
+ $display = array(
+ _("Subject") => strlen(_("Subject")),
+ _("From") => strlen(_("From")),
+ _("Date") => strlen(_("Date")),
+ _("To") => strlen(_("To")),
+ _("Cc") => strlen(_("Cc"))
+ );
+ $maxsize = max($display);
+ $indent = str_pad('',$maxsize+2);
+ foreach($display as $key => $val) {
+ $display[$key] = $key .': '. str_pad('', $maxsize - $val);
+ }
+ $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH);
+ $bodyTop .= "\n". $display[_("Subject")] . decodeHeader($orig_header->subject) . "\n" .
+ $display[_("From")] . decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" .
+ $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
+ $display[_("To")] . decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n";
+ if ($orig_header->cc != array() && $orig_header->cc !='') {
+ $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";
+ }
+ $bodyTop .= str_pad('', $editor_size -2 , '-');
+ $bodyTop .= "\n";
+ return $bodyTop;
+}
+/* ----------------------------------------------------------------------- */
-/**
- * Does the opposite of sqWordWrap()
+/*
+ * If the session is expired during a post this restores the compose session
+ * vars.
*/
-function sqUnWordWrap(&$body) {
- $lines = explode("\n", $body);
- $body = '';
- $PreviousSpaces = '';
- for ($i = 0; $i < count($lines); $i ++) {
- ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
- $CurrentSpaces = $regs[1];
- if (isset($regs[2])) {
- $CurrentRest = $regs[2];
- }
-
- if ($i == 0) {
- $PreviousSpaces = $CurrentSpaces;
- $body = $lines[$i];
- } else if (($PreviousSpaces == $CurrentSpaces) /* Do the beginnings match */
- && (strlen($lines[$i - 1]) > 65) /* Over 65 characters long */
- && strlen($CurrentRest)) { /* and there's a line to continue with */
- $body .= ' ' . $CurrentRest;
- } else {
- $body .= "\n" . $lines[$i];
- $PreviousSpaces = $CurrentSpaces;
- }
- }
- $body .= "\n";
+//$session_expired = false;
+if (session_is_registered('session_expired_post')) {
+ global $session_expired_post, $session_expired;
+ /*
+ * extra check for username so we don't display previous post data from
+ * another user during this session.
+ */
+ if ($session_expired_post['username'] != $username) {
+ session_unregister('session_expired_post');
+ session_unregister('session_expired');
+ } else {
+ foreach ($session_expired_post as $postvar => $val) {
+ if (isset($val)) {
+ $$postvar = $val;
+ } else {
+ $$postvar = '';
+ }
+ }
+ if (isset($send)) {
+ unset($send);
+ }
+ $session_expired = true;
+ }
+ session_unregister('session_expired_post');
+ session_unregister('session_expired');
+ if (!isset($mailbox)) {
+ $mailbox = '';
+ }
+ if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+ } else {
+ displayPageHeader($color, $mailbox);
+ }
+ showInputForm($session, false);
+ exit();
}
-/* ----------------------------------------------------------------------- */
-
if (!isset($attachments)) {
$attachments = array();
session_register('attachments');
session_register('composesession');
}
-if (!isset($session)) {
+if (!isset($session) || (isset($newmessage) && $newmessage)) {
$session = "$composesession" +1;
$composesession = $session;
-}
+}
if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
$mailbox = 'INBOX';
if (isset($draft)) {
include_once ('../src/draft_actions.php');
- if (! isset($reply_id)) {
- $reply_id = 0;
+ if (! isset($passed_id)) {
+ $passed_id = 0;
}
if (! isset($MDN)) {
$MDN = 'False';
if (! isset($mailprio)) {
$mailprio = '';
}
- if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio, $session)) {
+ if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $passed_id, $mailprio, $session)) {
showInputForm($session);
exit();
} else {
}
else {
Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort".
- "&startMessage=1¬e=$draft_message");
+ "&startMessage=1¬e=".urlencode($draft_message));
exit();
}
}
}
if (checkInput(false) && !isset($AttachFailure)) {
$urlMailbox = urlencode (trim($mailbox));
- if (! isset($reply_id)) {
- $reply_id = 0;
+ if (! isset($passed_id)) {
+ $passed_id = 0;
}
/*
* Set $default_charset to correspond with the user's selection
$MDN = False; // we are not sending a mdn response
if (! isset($mailprio)) {
$Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
- $subject, $body, $reply_id, $MDN, '', $session);
+ $subject, $body, $passed_id, $MDN, '', $session);
} else {
$Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
- $subject, $body, $reply_id, $MDN, $mailprio, $session);
+ $subject, $body, $passed_id, $MDN, $mailprio, $session);
}
if (! $Result) {
showInputForm($session);
exit();
}
if ($compose_new_win == '1') {
- Header("Location: compose.php?mail_sent=yes&session=$composesession");
+ Header("Location: compose.php?mail_sent=yes");
}
else {
Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
plain_error_message(_("Could not move/copy file. File not attached"),
$color);
}
-
checkInput(true);
showInputForm($session);
/* sqimap_logout($imapConnection); */
unlink ($attached_file);
unset ($attachments[$index]);
}
+ setPref($data_dir, $username, 'attachments', serialize($attachments));
}
showInputForm($session);
-
-} elseif (isset($attachedmessages)) {
-
- /*
- * This handles the case if we attache message
- */
- $imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0);
- if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
- }
- else {
- displayPageHeader($color, $mailbox);
- }
-
- $newmail = true;
-
- newMail();
- showInputForm($session);
- sqimap_logout($imapConnection);
-
} else {
/*
* 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);
- if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
- }
- else {
- displayPageHeader($color, $mailbox);
- }
+
+ if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+ } else {
+ displayPageHeader($color, $mailbox);
+ }
$newmail = true;
- ClearAttachments($session);
+ if (!isset($passed_ent_id)) $passed_ent_id = '';
+ if (!isset($passed_id)) $passed_id = '';
+ if (!isset($mailbox)) $mailbox = '';
+ if (!isset($action)) $action = '';
+
+ $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session);
- if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num) {
- getAttachments(0, $session);
+ /* in case the origin is not read_body.php */
+ if (isset($send_to)) {
+ $values['send_to'] = $send_to;
}
-
- if (isset($draft_id) && $draft_id && isset($ent_num) && $ent_num) {
- getAttachments(0, $session);
+ if (isset($send_to_cc)) {
+ $values['send_to_cc'] = $send_to_cc;
}
-
- newMail($session);
- showInputForm($session);
- sqimap_logout($imapConnection);
+ if (isset($send_to_bcc)) {
+ $values['send_to_bcc'] = $send_to_bcc;
+ }
+ showInputForm($session, $values);
}
exit();
-
/**************** Only function definitions go below *************/
/* 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,
- $draft_id, $use_signature, $composesession, $forward_cc;
-
- $send_to = decodeHeader($send_to, false);
- $send_to_cc = decodeHeader($send_to_cc, false);
- $send_to_bcc = decodeHeader($send_to_bcc, false);
- $send_to = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to))));
- $send_to_cc = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to_cc))));
- $send_to_bcc = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to_bcc))));
+function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
+ global $editor_size, $default_use_priority,
+ $use_signature, $composesession, $data_dir, $username,
+ $username, $key, $imapServerAddress, $imapPort;
- if ($forward_id) {
- $id = $forward_id;
- } elseif ($reply_id) {
- $id = $reply_id;
- }
-
- if ($draft_id){
- $id = $draft_id;
- $use_signature = FALSE;
- }
+ $send_to = $send_to_cc = $send_to_bcc = $subject = $body = $identity = '';
+ $mailprio = 3;
- if (isset($id)) {
+ if ($passed_id) {
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapPort, 0);
+
sqimap_mailbox_select($imapConnection, $mailbox);
- $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);
- }
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $body = '';
+ if ($passed_ent_id) {
+ /* redefine the messsage in case of message/rfc822 */
+ $message = $message->getEntity($passed_ent_id);
+ /* message is an entity which contains the envelope and type0=message
+ * and type1=rfc822. The actual entities are childs from
+ * $message->entities[0]. That's where the encoding and is located
+ */
+
+ $entities = $message->entities[0]->findDisplayEntity
+ (array(), $alt_order = array('text/plain'));
+ if (!count($entities)) {
+ $entities = $message->entities[0]->findDisplayEntity
+ (array(), $alt_order = array('text/plain','html/plain'));
+ }
+ $orig_header = $message->rfc822_header; /* here is the envelope located */
+ /* redefine the message for picking up the attachments */
+ $message = $message->entities[0];
+
+ } else {
+ $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain'));
+ if (!count($entities)) {
+ $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain'));
+ }
+ $orig_header = $message->rfc822_header;
+ }
+ $encoding = $message->header->encoding;
+ $type0 = $message->type0;
+ $type1 = $message->type1;
+ foreach ($entities as $ent) {
+ $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent);
+ $body_part_entity = $message->getEntity($ent);
+ $bodypart = decodeBody($unencoded_bodypart,
+ $body_part_entity->header->encoding);
+ if ($type1 == 'html') {
+ $bodypart = strip_tags($bodypart);
+ }
+ $body .= $bodypart;
+ }
+ if ($default_use_priority) {
+ $mailprio = substr($orig_header->priority,0,1);
+ if (!$mailprio) {
+ $mailprio = 3;
+ }
+ } else {
+ $mailprio = '';
+ }
+ ClearAttachments($session);
+
+ $identity = '';
+ $idents = getPref($data_dir, $username, 'identities');
+ $from_o = $orig_header->from;
+ if (is_object($from_o)) {
+ $orig_from = $from_o->getAddress();
} else {
- $body = '';
- }
-
- if ($message->header->type1 == 'html') {
- $body = strip_tags($body);
- }
-
- //sqUnWordWrap($body);
- $body_ary = explode("\n", $body);
- $i = count($body_ary) - 1;
- while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
- unset($body_ary[$i]);
- $i --;
+ $orig_from = '';
+ }
+ if (!empty($idents) && $idents > 1) {
+ for ($i = 1; $i < $idents; $i++) {
+ $enc_from_name = '"'.
+ getPref($data_dir,
+ $username,
+ 'full_name' . $i) .
+ '" <' . getPref($data_dir, $username,
+ 'email_address' . $i) . '>';
+ if ($enc_from_name == $orig_from) {
+ $identity = $i;
+ break;
+ }
+ }
}
- $body = '';
- for ($i=0; isset($body_ary[$i]); $i++) {
- if ($reply_id) {
- if (ereg('^[ >]+', $body_ary[$i])) {
- $body_ary[$i] = '>' . $body_ary[$i];
- } else {
- $body_ary[$i] = '> ' . $body_ary[$i];
- }
- }
- if (!$draft_id) {
- sqWordWrap($body_ary[$i], $editor_size - 1);
- }
- $body .= $body_ary[$i] . "\n";
- unset($body_ary[$i]);
- }
- if ($forward_id) {
- $bodyTop = '-------- ' . _("Original Message") . " --------\n" .
- _("Subject") . ': ' . $orig_header->subject . "\n" .
- _("From") . ': ' . $orig_header->from . "\n" .
- _("Date") . ': ' .
- getLongDateString( $orig_header->date ). "\n" .
- _("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";
- }
- }
- if (isset($forward_cc) && $forward_cc) {
- $bodyTop .= _("Cc") . ': ' . $orig_header->cc[0] . "\n";
- if (count($orig_header->cc) > 1) {
- for ($x = 1; $x < count($orig_header->cc); $x++) {
- $bodyTop .= ' ' . $orig_header->cc[$x] . "\n";
- }
- }
- }
- $bodyTop .= "\n";
- $body = $bodyTop . $body;
- }
- elseif ($reply_id) {
- $orig_from = decodeHeader($orig_header->from, false);
- $body = getReplyCitation($orig_from) . $body;
- }
-
- return;
- }
-
- if (!$send_to) {
- $send_to = sqimap_find_email($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 = str_replace(';', ',', $send_to_cc);
- $sendcc = explode(',', $send_to_cc);
- $send_to_cc = '';
-
- for ($i = 0; $i < count($sendcc); $i++) {
- $sendcc[$i] = trim($sendcc[$i]);
- if ($sendcc[$i] == '') {
- continue;
- }
-
- $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))) &&
- (trim($sendcc[$i]) != '')) {
- $send_to_cc .= trim($sendcc[$i]) . ', ';
- }
- }
- $send_to_cc = trim($send_to_cc);
- if (substr($send_to_cc, -1) == ',') {
- $send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1);
+
+ switch ($action) {
+ case ('draft'):
+ $use_signature = FALSE;
+ $send_to = $orig_header->getAddr_s('to');
+ $send_to_cc = $orig_header->getAddr_s('cc');
+ $send_to_bcc = $orig_header->getAddr_s('bcc');
+ $subject = $orig_header->subject;
+
+ $body_ary = explode("\n", $body);
+ $cnt = count($body_ary) ;
+ $body = '';
+ for ($i=0; $i < $cnt; $i++) {
+ if (!ereg("^[>\\s]*$", $body_ary[$i])) {
+ sqWordWrap($body_ary[$i], $editor_size );
+ $body .= $body_ary[$i] . "\n";
+ }
+ unset($body_ary[$i]);
+ }
+ sqUnWordWrap($body);
+ getAttachments($message, $session, $passed_id, $entities, $imapConnection);
+ break;
+ case ('edit_as_new'):
+ $send_to = $orig_header->getAddr_s('to');
+ $send_to_cc = $orig_header->getAddr_s('cc');
+ $send_to_bcc = $orig_header->getAddr_s('bcc');
+ $subject = $orig_header->subject;
+ $mailprio = $orig_header->priority;
+ $orig_from = '';
+ getAttachments($message, $session, $passed_id, $entities, $imapConnection);
+ sqUnWordWrap($body);
+ break;
+ case ('forward'):
+ $send_to = '';
+ $subject = $orig_header->subject;
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ (substr(strtolower($subject), 0, 5) != '[fwd:') &&
+ (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
+ $subject = '[Fwd: ' . $subject . ']';
+ }
+ $body = getforwardHeader($orig_header) . $body;
+ sqUnWordWrap($body);
+ getAttachments($message, $session, $passed_id, $entities, $imapConnection);
+ break;
+ case ('forward_as_attachment'):
+ getMessage_RFC822_Attachment($message, $session, $passed_id, $imapConnection);
+ $body = '';
+ break;
+ case ('reply_all'):
+ $send_to_cc = replyAllString($orig_header);
+ case ('reply'):
+ $send_to = $orig_header->reply_to;
+ if (is_object($send_to)) {
+ $send_to = $send_to->getAddr_s('reply_to');
+ } else {
+ $send_to = $orig_header->getAddr_s('from');
+ }
+ $subject = $orig_header->subject;
+ $subject = str_replace('"', "'", $subject);
+ $subject = trim($subject);
+ if (substr(strtolower($subject), 0, 3) != 're:') {
+ $subject = 'Re: ' . $subject;
+ }
+ /* this corrects some wrapping/quoting problems on replies */
+ $rewrap_body = explode("\n", $body);
+ $body = getReplyCitation($orig_header->from->personal);
+ $cnt = count($rewrap_body);
+ for ($i=0;$i<$cnt;$i++) {
+ sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+ if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+ $gt = $matches[1];
+ $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
+ } else {
+ $body .= '> ' . $rewrap_body[$i] . "\n";
+ }
+ unset($rewrap_body[$i]);
+ }
+ break;
+ default:
+ break;
}
+ sqimap_logout($imapConnection);
}
+ $ret = array(
+ 'send_to' => $send_to,
+ 'send_to_cc' => $send_to_cc,
+ 'send_to_bcc' => $send_to_bcc,
+ 'subject' => $subject,
+ 'mailprio' => $mailprio,
+ 'body' => $body,
+ 'identity' => $identity
+ );
+
+ return ($ret);
} /* function newMail() */
-function getAttachments($message, $session) {
- global $mailbox, $attachments, $attachment_dir, $imapConnection,
- $ent_num, $forward_id, $draft_id, $username;
-
- if (isset($draft_id)) {
- $id = $draft_id;
- } else {
- $id = $forward_id;
- }
-
- if (!$message) {
- sqimap_mailbox_select($imapConnection, $mailbox);
- $message = sqimap_get_message($imapConnection, $id, $mailbox);
- }
-
+function getAttachments($message, $session, $passed_id, $entities, $imapConnection) {
+ global $attachments, $attachment_dir, $username, $data_dir;
+
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- if (count($message->entities) == 0) {
- if ($message->header->entity_id != $ent_num) {
- $filename = decodeHeader($message->header->filename);
-
- if ($filename == "") {
- $filename = "untitled-".$message->header->entity_id;
+ if (!count($message->entities) ||
+ ($message->type0 == 'message' && $message->type1 == 'rfc822')) {
+ if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
+ if ($message->type0 == 'message' && $message->type1 == 'rfc822') {
+ $filename = decodeHeader($message->rfc822_header->subject.'.eml');
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id.'.eml';
+ }
+ } else {
+ $filename = decodeHeader($message->header->getParameter('filename'));
+ if ($filename == '') {
+ $name = decodeHeader($message->header->getParameter('name'));
+ if ($name == '') {
+ $filename = "untitled-".$message->entity_id;
+ } else {
+ $filename = $name;
+ }
+ }
}
-
$localfilename = GenerateRandomString(32, '', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
while (file_exists($full_localfilename)) {
$newAttachment = array();
$newAttachment['localfilename'] = $localfilename;
$newAttachment['remotefilename'] = $filename;
- $newAttachment['type'] = strtolower($message->header->type0 .
- '/' . $message->header->type1);
+ $newAttachment['type'] = strtolower($message->type0 .
+ '/' . $message->type1);
$newAttachment['id'] = strtolower($message->header->id);
$newAttachment['session'] = $session;
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'w');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
- $id, $message->header->entity_id),
+ $passed_id, $message->entity_id),
$message->header->encoding));
fclose ($fp);
$attachments[] = $newAttachment;
+ setPref($data_dir, $username, 'attachments', $attachments);
}
} else {
for ($i = 0; $i < count($message->entities); $i++) {
- getAttachments($message->entities[$i], $session);
+ getAttachments($message->entities[$i], $session, $passed_id, $entities, $imapConnection);
}
}
return;
}
-function showInputForm ($session) {
- global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
+function getMessage_RFC822_Attachment($message, $session, $passed_id, $imapConnection) {
+ global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $body_a = sqimap_run_command($imapConnection, "FETCH $passed_id RFC822",true, $response, $readmessage, $uid_support);
+ if ($response = 'OK') {
+ $subject = encodeHeader($message->rfc822_header->subject);
+ array_shift($body_a);
+ $body = implode('', $body_a);
+ $body .= "\r\n";
+
+ $localfilename = GenerateRandomString(32, 'FILE', 7);
+ $full_localfilename = "$hashed_attachment_dir/$localfilename";
+
+ $fp = fopen( $full_localfilename, 'w');
+ fwrite ($fp, $body);
+ fclose($fp);
+ $newAttachment = array();
+ $newAttachment['localfilename'] = $localfilename;
+ $newAttachment['type'] = "message/rfc822";
+ $newAttachment['remotefilename'] = $subject.'.eml';
+ $newAttachment['session'] = $session;
+ $attachments[] = $newAttachment;
+ }
+ return;
+}
+
+function showInputForm ($session, $values=false) {
+ global $send_to, $send_to_cc, $body,
$passed_body, $color, $use_signature, $signature, $prefix_sig,
$editor_size, $attachments, $subject, $newmail,
- $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
+ $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
$from_htmladdr_search, $location_of_buttons, $attachment_dir,
$username, $data_dir, $identity, $draft_id, $delete_draft,
$mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
- $saved_draft, $mail_sent, $sig_first;
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
+ $username;
$subject = decodeHeader($subject, false);
- $reply_subj = decodeHeader($reply_subj, false);
- $forward_subj = decodeHeader($forward_subj, false);
-
+ if ($values) {
+ $send_to = $values['send_to'];
+ $send_to_cc = $values['send_to_cc'];
+ $send_to_bcc = $values['send_to_bcc'];
+ $subject = $values['subject'];
+ $mailprio = $values['mailprio'];
+ $body = $values['body'];
+ $identity = $values['identity'];
+ }
+
if ($use_javascript_addr_book) {
echo "\n". '<SCRIPT LANGUAGE=JavaScript><!--' . "\n" .
'function open_abook() { ' . "\n" .
echo ">\n";
- if (isset($draft_id)) {
- echo '<input type="hidden" name="delete_draft" value="' . $draft_id . "\">\n";
+ if ($action == 'draft') {
+ echo '<input type="hidden" name="delete_draft" value="' . $passed_id . "\">\n";
}
if (isset($delete_draft)) {
echo '<input type="hidden" name="delete_draft" value="' . $delete_draft. "\">\n";
}
if (isset($session)) {
- echo '<input type="hidden" name="session" value="' . "$session" . "\">\n";
+ echo '<input type="hidden" name="session" value="' . $session . "\">\n";
+ }
+
+ if (isset($passed_id)) {
+ echo '<input type="hidden" name="passed_id" value="' . $passed_id . "\">\n";
}
if ($saved_draft == 'yes') {
' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
_("Subject:") .
' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
- if ($reply_subj) {
- $reply_subj = str_replace('"', "'", $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=60 VALUE="' .
- htmlspecialchars($reply_subj) . '">';
- }
- elseif ($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=60 VALUE="' .
- htmlspecialchars($forward_subj) . '">';
- } else {
echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
htmlspecialchars($subject) . '">';
- }
echo '</td></tr>' . "\n\n";
if ($location_of_buttons == 'between') {
' ' .
'</td><td align=left bgcolor="' . $color[0] . '">';
foreach ($attachments as $key => $info) {
- if ($info['session'] == $session) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
- $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
- show_readable_size(filesize($attached_file)) . ")<br>\n";
- }
+ if ($info['session'] == $session) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
+ $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
+ show_readable_size( filesize( $attached_file ) ) . ")<br>\n";
+ }
}
echo '<input type="submit" name="do_delete" value="' .
echo '</TABLE>'."\n";
}
echo '</TABLE>' . "\n";
- if ($reply_id) {
- echo '<input type=hidden name=reply_id value=' . $reply_id . ">\n";
- }
+
+ echo '<input type="hidden" name="username" value="'. $username . "\">\n";
+ echo '<input type=hidden name=action value=' . $action . ">\n";
echo '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
"\">\n" .
'</FORM>';
}
}
- echo " <TR><td>\n </td><td>\n";
+ echo " </td></tr>\n <TR><td>\n </td><td>\n";
echo "\n <INPUT TYPE=SUBMIT NAME=\"sigappend\" VALUE=\"". _("Signature") . "\">\n";
if ($use_javascript_addr_book) {
echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"".
/* True if FAILURE */
function saveAttachedFiles($session) {
- global $HTTP_POST_FILES, $attachment_dir, $attachments, $username;
+ global $HTTP_POST_FILES, $attachment_dir, $attachments, $username,
+ $data_dir;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$localfilename = GenerateRandomString(32, '', 7);
}
if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ if (function_exists("move_uploaded_file")) {
+ if (!@move_uploaded_file($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
return true;
- }
- }
+ }
+ } else {
+ if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ return true;
+ }
+ }
+ }
$newAttachment['localfilename'] = $localfilename;
$newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
$newAttachment['type'] = strtolower($HTTP_POST_FILES['attachfile']['type']);
if ($newAttachment['type'] == "") {
$newAttachment['type'] = 'application/octet-stream';
}
-
$attachments[] = $newAttachment;
+ setPref($data_dir, $username, 'attachments', serialize($attachments));
}
function ClearAttachments($session)
{
- global $username, $attachments, $attachment_dir;
+ global $username, $attachments, $attachment_dir, $data_dir;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rem_attachments = array();
}
}
$attachments = $rem_attachments;
+ setPref($data_dir, $username, 'attachments', serialize($attachments));
}
return '';
}
- /* Decode the users name. */
- $parpos = strpos($orig_from, '(');
- if ($parpos === false) {
- $orig_from = trim(substr($orig_from, 0, strpos($orig_from, '<')));
- $orig_from = str_replace('"', '', $orig_from);
- $orig_from = str_replace("'", '', $orig_from);
- } else {
- $end_parpos = strrpos($orig_from, ')');
- $end_parpos -= ($end_parpos === false ? $end_parpos : $parpos + 1);
- $orig_from = trim(substr($orig_from, $parpos + 1, $end_parpos));
- }
-
/* Make sure our final value isn't an empty string. */
if ($orig_from == '') {
return '';
$end = '">';
break;
case 'user-defined':
- $start = $reply_citation_start . ' ';
+ $start = $reply_citation_start .
+ ($reply_citation_start == '' ? '' : ' ');
$end = $reply_citation_end;
break;
default: