}
function getforwardHeader($orig_header) {
- $bodyTop = '-------- ' . _("Original Message") . " --------\n" .
- _("Subject") . ': ' . $orig_header->subject . "\n" .
- _("From") . ': ' . $orig_header->from->getAddress() . "\n" .
- _("Date") . ': ' .
- getLongDateString( $orig_header->date ). "\n" .
- _("To") . ': ' . $orig_header->to[0]->getAddress() . "\n";
- if (count($orig_header->to) > 1) {
- for ($x=1; $x < count($orig_header->to); $x++) {
- $bodyTop .= ' ' . $orig_header->to[$x]->getAddress() . "\n";
- }
- }
+ 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 .= _("Cc") . ': ' . $orig_header->cc[0]->getAddress() . "\n";
- if (count($orig_header->cc) > 1) {
- for ($x = 1; $x < count($orig_header->cc); $x++) {
- $bodyTop .= ' ' . $orig_header->cc[$x]->getAddress() . "\n";
- }
- }
+ $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";
}
+ $bodyTop .= str_pad('', $editor_size -2 , '-');
$bodyTop .= "\n";
return $bodyTop;
}
/* ----------------------------------------------------------------------- */
+/*
+ * If the session is expired during a post this restores the compose session
+ * vars.
+ */
+//$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');
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 {
}
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);
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;
-
- if (!isset($passed_ent_id)) $passed_ent_id = '';
- if (!isset($passed_id)) $passed_id = '';
- if (!isset($mailbox)) $mailbox = '';
- if (!isset($action)) $action = '';
-
- $values = newMail($imapConnection,$mailbox,$passed_id,$passed_ent_id, $action, $session);
- /* in case the origin is not read_body.php */
- if (isset($send_to)) {
- $values['send_to'] = $send_to;
- }
- if (isset($send_to_cc)) {
- $values['send_to_cc'] = $send_cc;
- }
- if (isset($send_to_bcc)) {
- $values['send_to_bcc'] = $send_bcc;
- }
-
- showInputForm($session, $values);
- 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;
if (!isset($mailbox)) $mailbox = '';
if (!isset($action)) $action = '';
- $values = newMail($imapConnection,$mailbox,$passed_id,$passed_ent_id, $action, $session);
+ $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session);
/* in case the origin is not read_body.php */
if (isset($send_to)) {
$values['send_to'] = $send_to;
}
if (isset($send_to_cc)) {
- $values['send_to_cc'] = $send_cc;
+ $values['send_to_cc'] = $send_to_cc;
}
if (isset($send_to_bcc)) {
- $values['send_to_bcc'] = $send_bcc;
+ $values['send_to_bcc'] = $send_to_bcc;
}
showInputForm($session, $values);
- sqimap_logout($imapConnection);
}
exit();
/* This function is used when not sending or adding attachments */
-function newMail ($imapConnection, $mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
+function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
global $editor_size, $default_use_priority,
- $use_signature, $composesession, $data_dir, $username;
+ $use_signature, $composesession, $data_dir, $username,
+ $username, $key, $imapServerAddress, $imapPort;
$send_to = $send_to_cc = $send_to_bcc = $subject = $body = $identity = '';
$mailprio = 3;
+
if ($passed_id) {
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapPort, 0);
+
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$body = '';
$entities = $message->entities[0]->findDisplayEntity
(array(), $alt_order = array('text/plain','html/plain'));
}
- $orig_header = $message->header; /* here is the envelope located */
+ $orig_header = $message->rfc822_header; /* here is the envelope located */
/* redefine the message for picking up the attachments */
$message = $message->entities[0];
if (!count($entities)) {
$entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain'));
}
- $orig_header = $message->header;
+ $orig_header = $message->rfc822_header;
}
$encoding = $message->header->encoding;
$type0 = $message->type0;
$type1 = $message->type1;
-
foreach ($entities as $ent) {
- $bodypart = decodeBody(
- mime_fetch_body($imapConnection, $passed_id, $ent),
- $encoding);
+ $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);
}
}
if ($default_use_priority) {
$mailprio = substr($orig_header->priority,0,1);
+ if (!$mailprio) {
+ $mailprio = 3;
+ }
} else {
$mailprio = '';
}
$identity = '';
$idents = getPref($data_dir, $username, 'identities');
- $from_o = $message->header->from;
+ $from_o = $orig_header->from;
if (is_object($from_o)) {
$orig_from = $from_o->getAddress();
} else {
}
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 = '';
-// $orig_from = $orig_header->from->getAddress();
- $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 ('reply' || 'reply_all'):
- $send_to = $orig_header->reply_to;
- if ($send_to) {
- $send_to = $send_to->getAddress();
- } else {
- $send_to = $orig_header->from->getAddress();
- }
-// $orig_from = $orig_header->from->getAddress();
- $subject = $orig_header->subject;
- $subject = str_replace('"', "'", $subject);
- $subject = trim($subject);
- if (substr(strtolower($subject), 0, 3) != 're:') {
- $subject = 'Re: ' . $subject;
- }
- if ($action == 'reply_all') {
- $send_to_cc = replyAllString($orig_header);
- }
- /* 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;
+ 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, $passed_ent_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,
function getAttachments($message, $session, $passed_id, $entities, $imapConnection) {
- global $attachments, $attachment_dir, $username;
+ global $attachments, $attachment_dir, $username, $data_dir;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
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->header->subject.'.eml');
+ $filename = decodeHeader($message->rfc822_header->subject.'.eml');
if ($filename == "") {
$filename = "untitled-".$message->entity_id.'.eml';
}
} else {
- $filename = decodeHeader($message->header->filename);
- if ($filename == "") {
- $filename = "untitled-".$message->entity_id;
+ $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);
$passed_id, $message->entity_id),
$message->header->encoding));
fclose ($fp);
-
$attachments[] = $newAttachment;
}
} else {
getAttachments($message->entities[$i], $session, $passed_id, $entities, $imapConnection);
}
}
+ setPref($data_dir, $username, 'attachments', serialize($attachments));
+ return;
+}
+
+function getMessage_RFC822_Attachment($message, $session, $passed_id,
+ $passed_ent_id='', $imapConnection) {
+ global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ if (!$passed_ent_id) {
+ $body_a = sqimap_run_command($imapConnection,
+ 'FETCH '.$passed_id.' RFC822',
+ true, $response, $readmessage, $uid_support);
+ } else {
+ $body_a = sqimap_run_command($imapConnection,
+ 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
+ true, $response, $readmessage, $uid_support);
+ $message = $message->parent;
+ }
+ 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;
+ }
+ setPref($data_dir, $username, 'attachments', serialize($attachments));
return;
}
$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, $edit_as_new, $action;
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
+ $username;
$subject = decodeHeader($subject, false);
if ($values) {
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') {
echo '</TABLE>'."\n";
}
echo '</TABLE>' . "\n";
- if ($action = 'reply' || $action = 'reply_all') {
- echo '<input type=hidden name=reply_id value=' . $passed_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>';
/* 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);
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));
}
$end = '">';
break;
case 'user-defined':
- $start = $reply_citation_start . ' ';
+ $start = $reply_citation_start .
+ ($reply_citation_start == '' ? '' : ' ');
$end = $reply_citation_end;
break;
default:
projects / squirrelmail.git / blobdiff