X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=f6f9f548e404a31099b164706d4ba13c179b973a;hp=c09f97e03ace74c498ae674c2e7e47421f999f26;hb=6fc2ba92328111ab918d525f35f457aeaea608cd;hpb=4a44d6e73d1f65bc0692a542475b0f6bb5d89543
diff --git a/src/compose.php b/src/compose.php
index c09f97e0..f6f9f548 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -88,7 +88,7 @@ sqgetGlobalVar('do_delete', $do_delete, SQ_POST);
sqgetGlobalVar('delete', $delete, SQ_POST);
sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST);
if ( sqgetGlobalVar('return', $temp, SQ_POST) ) {
- $html_addr_search_done = 'Use Addresses';
+ $html_addr_search_done = 'Use Addresses';
}
/** GET VARS */
@@ -97,12 +97,12 @@ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
/** get smaction */
if ( !sqgetGlobalVar('smaction',$action) )
{
- if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply';
- if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all';
- if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward';
- if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment';
- if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft';
- if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
+ if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply';
+ if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all';
+ if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward';
+ if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment';
+ if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft';
+ if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
}
/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
@@ -113,49 +113,48 @@ $idents = get_identities();
/* --------------------- Specific Functions ------------------------------ */
function replyAllString($header) {
- global $include_self_reply_all, $idents;
- $excl_ar = 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) {
- foreach($idents as $id) {
- $excl_ar[strtolower(trim($id['email_address']))] = '';
+ global $include_self_reply_all, $idents;
+ $excl_ar = array();
+ /**
+ * 1) Remove the addresses we'll be sending the message 'to'
+ */
+ 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) {
+ foreach($idents as $id) {
+ $excl_ar[strtolower(trim($id['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) {
- // if personal name contains address separator then surround
- // the personal name with double quotes.
- if (strpos($personal,',') !== false) {
- $personal = '"'.$personal.'"';
- }
- $url_replytoallcc .= ", $personal <$email>";
- } else {
- $url_replytoallcc .= ', '. $email;
- }
- }
- $url_replytoallcc = substr($url_replytoallcc,2);
-
- return $url_replytoallcc;
+ }
+
+ /**
+ * 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) {
+ // if personal name contains address separator then surround
+ // the personal name with double quotes.
+ if (strpos($personal,',') !== false) {
+ $personal = '"'.$personal.'"';
+ }
+ $url_replytoallcc .= ", $personal <$email>";
+ } else {
+ $url_replytoallcc .= ', '. $email;
+ }
+ }
+ $url_replytoallcc = substr($url_replytoallcc,2);
+
+ return $url_replytoallcc;
}
function getReplyCitation($orig_from, $orig_date) {
@@ -174,25 +173,25 @@ function getReplyCitation($orig_from, $orig_date) {
/* Otherwise, try to select the desired citation style. */
switch ($reply_citation_style) {
- case 'author_said':
- $start = '';
- $end = ' ' . _("said") . ':';
- break;
- case 'quote_who':
- $start = '<' . _("quote") . ' ' . _("who") . '="';
- $end = '">';
- break;
- case 'date_time_author':
- $start = 'On ' . getLongDateString($orig_date) . ', ';
- $end = ' ' . _("said") . ':';
- break;
- case 'user-defined':
- $start = $reply_citation_start .
- ($reply_citation_start == '' ? '' : ' ');
- $end = $reply_citation_end;
- break;
- default:
- return '';
+ case 'author_said':
+ $start = '';
+ $end = ' ' . _("said") . ':';
+ break;
+ case 'quote_who':
+ $start = '<' . _("quote") . ' ' . _("who") . '="';
+ $end = '">';
+ break;
+ case 'date_time_author':
+ $start = 'On ' . getLongDateString($orig_date) . ', ';
+ $end = ' ' . _("said") . ':';
+ break;
+ case 'user-defined':
+ $start = $reply_citation_start .
+ ($reply_citation_start == '' ? '' : ' ');
+ $end = $reply_citation_end;
+ break;
+ default:
+ return '';
}
/* Build and return the citation string. */
@@ -202,35 +201,35 @@ function getReplyCitation($orig_from, $orig_date) {
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);
- }
- $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true);
- $from = str_replace(' ',' ',$from);
- $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true);
- $to = str_replace(' ',' ',$to);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $subject = str_replace(' ',' ',$subject);
- $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n". $display[_("Subject")] . $subject . "\n" .
- $display[_("From")] . $from . "\n" .
- $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
- $display[_("To")] . $to . "\n";
- if ($orig_header->cc != array() && $orig_header->cc !='') {
- $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true);
- $cc = str_replace(' ',' ',$cc);
- $bodyTop .= $display[_("Cc")] .$cc . "\n";
- }
- $bodyTop .= str_pad('', $editor_size -2 , '-') .
- "\n\n";
- return $bodyTop;
+ $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);
+ }
+ $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true);
+ $from = str_replace(' ',' ',$from);
+ $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true);
+ $to = str_replace(' ',' ',$to);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $subject = str_replace(' ',' ',$subject);
+ $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
+ "\n". $display[_("Subject")] . $subject . "\n" .
+ $display[_("From")] . $from . "\n" .
+ $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
+ $display[_("To")] . $to . "\n";
+ if ($orig_header->cc != array() && $orig_header->cc !='') {
+ $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true);
+ $cc = str_replace(' ',' ',$cc);
+ $bodyTop .= $display[_("Cc")] .$cc . "\n";
+ }
+ $bodyTop .= str_pad('', $editor_size -2 , '-') .
+ "\n\n";
+ return $bodyTop;
}
/* ----------------------------------------------------------------------- */
@@ -290,18 +289,18 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) {
sqsession_register($composesession,'composesession');
}
if (!isset($compose_messages)) {
- $compose_messages = array();
+ $compose_messages = array();
}
if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) {
-/* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */
- $composeMessage = new Message();
- $rfc822_header = new Rfc822Header();
- $composeMessage->rfc822_header = $rfc822_header;
- $composeMessage->reply_rfc822_header = '';
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages,'compose_messages');
+ /* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */
+ $composeMessage = new Message();
+ $rfc822_header = new Rfc822Header();
+ $composeMessage->rfc822_header = $rfc822_header;
+ $composeMessage->reply_rfc822_header = '';
+ $compose_messages[$session] = $composeMessage;
+ sqsession_register($compose_messages,'compose_messages');
} else {
- $composeMessage=$compose_messages[$session];
+ $composeMessage=$compose_messages[$session];
}
if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
@@ -324,17 +323,17 @@ if ($draft) {
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) .
- "&message=$delete_draft&startMessage=1&saved_draft=yes");
+ "&message=$delete_draft&startMessage=1&saved_draft=yes");
exit();
}
else {
if ($compose_new_win == '1') {
- Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
+ Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
exit();
}
else {
- Header("Location: $location/right_main.php?mailbox=$draft_folder".
- "&startMessage=1¬e=".urlencode($draft_message));
+ Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
+ "&startMessage=1¬e=".urlencode($draft_message));
exit();
}
}
@@ -343,41 +342,39 @@ if ($draft) {
if ($send) {
if (isset($_FILES['attachfile']) &&
- $_FILES['attachfile']['tmp_name'] &&
- $_FILES['attachfile']['tmp_name'] != 'none') {
+ $_FILES['attachfile']['tmp_name'] &&
+ $_FILES['attachfile']['tmp_name'] != 'none') {
$AttachFailure = saveAttachedFiles($session);
}
if (checkInput(false) && !isset($AttachFailure)) {
- if ($mailbox == "All Folders") {
- /* We entered compose via the search results page */
- $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
- }
+ if ($mailbox == "All Folders") {
+ /* We entered compose via the search results page */
+ $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+ }
$urlMailbox = urlencode (trim($mailbox));
if (! isset($passed_id)) {
$passed_id = 0;
}
- /*
+ /**
* 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 "VIRTUAL" as the wrap type.
*/
$body = explode("\n", $body);
$newBody = '';
foreach ($body as $line) {
if( $line <> '-- ' ) {
- $line = rtrim($line);
+ $line = rtrim($line);
}
if (strlen($line) <= $editor_size + 1) {
$newBody .= $line . "\n";
@@ -400,7 +397,7 @@ if ($send) {
unset($compose_messages[$session]);
if ( isset($delete_draft)) {
Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ).
- "&message=$delete_draft&startMessage=1&mail_sent=yes");
+ "&message=$delete_draft&startMessage=1&mail_sent=yes");
exit();
}
if ($compose_new_win == '1') {
@@ -409,7 +406,7 @@ if ($send) {
}
else {
Header("Location: $location/right_main.php?mailbox=$urlMailbox".
- "&startMessage=$startMessage&mail_sent=yes");
+ "&startMessage=$startMessage&mail_sent=yes");
}
} else {
if ($compose_new_win == '1') {
@@ -419,20 +416,20 @@ if ($send) {
displayPageHeader($color, $mailbox);
}
if (isset($AttachFailure)) {
- plain_error_message(_("Could not move/copy file. File not attached"),
- $color);
+ plain_error_message(_("Could not move/copy file. File not attached"),
+ $color);
}
checkInput(true);
showInputForm($session);
/* sqimap_logout($imapConnection); */
}
} elseif (isset($html_addr_search_done)) {
- 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);
+ }
if (isset($send_to_search) && is_array($send_to_search)) {
foreach ($send_to_search as $k => $v) {
@@ -459,8 +456,8 @@ if ($send) {
showInputForm($session);
} elseif (isset($html_addr_search)) {
if (isset($_FILES['attachfile']) &&
- $_FILES['attachfile']['tmp_name'] &&
- $_FILES['attachfile']['tmp_name'] != 'none') {
+ $_FILES['attachfile']['tmp_name'] &&
+ $_FILES['attachfile']['tmp_name'] != 'none') {
if(saveAttachedFiles($session)) {
plain_error_message(_("Could not move/copy file. File not attached"), $color);
}
@@ -474,12 +471,11 @@ if ($send) {
if (saveAttachedFiles($session)) {
plain_error_message(_("Could not move/copy file. File not attached"), $color);
}
- 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);
+ }
showInputForm($session);
}
elseif (isset($sigappend)) {
@@ -487,18 +483,17 @@ elseif (isset($sigappend)) {
$body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
+ compose_Header($color, $mailbox);
} else {
displayPageHeader($color, $mailbox);
}
showInputForm($session);
} elseif (isset($do_delete)) {
- 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);
+ }
if (isset($delete) && is_array($delete)) {
$composeMessage = $compose_messages[$session];
@@ -523,9 +518,9 @@ elseif (isset($sigappend)) {
*/
if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
+ compose_Header($color, $mailbox);
} else {
- displayPageHeader($color, $mailbox);
+ displayPageHeader($color, $mailbox);
}
$newmail = true;
@@ -547,16 +542,16 @@ elseif (isset($sigappend)) {
/* in case the origin is not read_body.php */
if (isset($send_to)) {
- $values['send_to'] = $send_to;
+ $values['send_to'] = $send_to;
}
if (isset($send_to_cc)) {
- $values['send_to_cc'] = $send_to_cc;
+ $values['send_to_cc'] = $send_to_cc;
}
if (isset($send_to_bcc)) {
- $values['send_to_bcc'] = $send_to_bcc;
+ $values['send_to_bcc'] = $send_to_bcc;
}
if (isset($subject)) {
- $values['subject'] = $subject;
+ $values['subject'] = $subject;
}
showInputForm($session, $values);
}
@@ -568,8 +563,8 @@ exit();
function getforwardSubject($subject)
{
if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
- (substr(strtolower($subject), 0, 5) != '[fwd:') &&
- (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
+ (substr(strtolower($subject), 0, 5) != '[fwd:') &&
+ (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
}
return $subject;
@@ -578,9 +573,9 @@ function getforwardSubject($subject)
/* This function is used when not sending or adding attachments */
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
global $editor_size, $default_use_priority, $body, $idents,
- $use_signature, $composesession, $data_dir, $username,
- $username, $key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage, $body_quote;
+ $use_signature, $data_dir, $username,
+ $username, $key, $imapServerAddress, $imapPort, $compose_messages,
+ $composeMessage, $body_quote;
global $languages, $squirrelmail_language, $default_charset;
/*
@@ -595,7 +590,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
if ($passed_id) {
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0);
+ $imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
@@ -605,15 +600,15 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
/* 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
- */
+ * 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'));
+ (array(), $alt_order = array('text/plain'));
if (!count($entities)) {
$entities = $message->entities[0]->findDisplayEntity
- (array(), $alt_order = array('text/plain','html/plain'));
+ (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 */
@@ -627,37 +622,38 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$orig_header = $message->rfc822_header;
}
- $encoding = $message->header->encoding;
$type0 = $message->type0;
$type1 = $message->type1;
foreach ($entities as $ent) {
+ $msg = $message->getEntity($ent);
+ $type0 = $msg->type0;
+ $type1 = $msg->type1;
$unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent);
$body_part_entity = $message->getEntity($ent);
$bodypart = decodeBody($unencoded_bodypart,
- $body_part_entity->header->encoding);
+ $body_part_entity->header->encoding);
if ($type1 == 'html') {
$bodypart = str_replace("\n", ' ', $bodypart);
- $bodypart = preg_replace(array('/
/i','/
/i'), "\n", $bodypart);
+ $bodypart = preg_replace(array('/<\/?p>/i','/
<\/div>/i','/
/i','/<\/?div>/i'), "\n", $bodypart);
$bodypart = str_replace(array(' ','>','<'),array(' ','>','<'),$bodypart);
$bodypart = strip_tags($bodypart);
-
}
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) {
if (mb_detect_encoding($bodypart) != 'ASCII') {
- $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
+ $bodypart = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $bodypart);
}
}
- if (isset($body_part_entity->header->parameters['charset'])) {
- $actual = $body_part_entity->header->parameters['charset'];
- } else {
- $actual = 'us-ascii';
- }
+ if (isset($body_part_entity->header->parameters['charset'])) {
+ $actual = $body_part_entity->header->parameters['charset'];
+ } else {
+ $actual = 'us-ascii';
+ }
- if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
- $bodypart = charset_convert($actual,$bodypart,$default_charset);
- }
+ if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
+ $bodypart = charset_convert($actual,$bodypart,$default_charset,false);
+ }
$body .= $bodypart;
}
@@ -702,115 +698,112 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
}
switch ($action) {
- case ('draft'):
- $use_signature = FALSE;
- $composeMessage->rfc822_header = $orig_header;
- $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
- $send_from = $orig_header->getAddr_s('from');
- $send_from_parts = new AddressStructure();
- $send_from_parts = $orig_header->parseAddress($send_from);
- $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
- $identities = get_identities();
- if (count($identities) > 0) {
- foreach($identities as $iddata) {
- if ($send_from_add == $iddata['email_address']) {
- $identity = $iddata['index'];
- break;
+ case ('draft'):
+ $use_signature = FALSE;
+ $composeMessage->rfc822_header = $orig_header;
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $send_from = $orig_header->getAddr_s('from');
+ $send_from_parts = new AddressStructure();
+ $send_from_parts = $orig_header->parseAddress($send_from);
+ $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
+ $identities = get_identities();
+ if (count($identities) > 0) {
+ foreach($identities as $iddata) {
+ if ($send_from_add == $iddata['email_address']) {
+ $identity = $iddata['index'];
+ break;
+ }
}
}
- }
- $subject = decodeHeader($orig_header->subject,false,false,true);
-// /* remember the references and in-reply-to headers in case of an reply */
- $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
- $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
- $body_ary = explode("\n", $body);
- $cnt = count($body_ary) ;
- $body = '';
- for ($i=0; $i < $cnt; $i++) {
- if (!ereg("^[>\\s]*$", $body_ary[$i]) || !$body_ary[$i]) {
- sqWordWrap($body_ary[$i], $editor_size );
- $body .= $body_ary[$i] . "\n";
- }
- unset($body_ary[$i]);
- }
- sqUnWordWrap($body);
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- break;
- case ('edit_as_new'):
- $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $mailprio = $orig_header->priority;
- $orig_from = '';
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- sqUnWordWrap($body);
- break;
- case ('forward'):
- $send_to = '';
- $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
- $body = getforwardHeader($orig_header) . $body;
- sqUnWordWrap($body);
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- $body = "\n" . $body;
- break;
- case ('forward_as_attachment'):
- $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
- $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
- $body = '';
- break;
- case ('reply_all'):
- if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) {
- $send_to = $orig_header->getAddr_s('mail_followup_to');
- } else {
- $send_to_cc = replyAllString($orig_header);
- $send_to_cc = decodeHeader($send_to_cc,false,false,true);
- }
- case ('reply'):
- // skip this if send_to was already set right above here
- if(!$send_to) {
- $send_to = $orig_header->reply_to;
- if (is_array($send_to) && count($send_to)) {
- $send_to = $orig_header->getAddr_s('reply_to');
- } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
- $send_to = $orig_header->getAddr_s('reply_to');
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ /* remember the references and in-reply-to headers in case of an reply */
+ $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
+ $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
+ // rewrap the body to clean up quotations and line lengths
+ sqBodyWrap($body, $editor_size);
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ break;
+ case ('edit_as_new'):
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $mailprio = $orig_header->priority;
+ $orig_from = '';
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ // rewrap the body to clean up quotations and line lengths
+ sqBodyWrap($body, $editor_size);
+ break;
+ case ('forward'):
+ $send_to = '';
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
+ $body = getforwardHeader($orig_header) . $body;
+ // the logic for calling sqUnWordWrap here would be to allow the browser to wrap the lines
+ // forwarded message text should be as undisturbed as possible, so commenting out this call
+ // sqUnWordWrap($body);
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ //add a blank line after the forward headers
+ $body = "\n" . $body;
+ break;
+ case ('forward_as_attachment'):
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
+ $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
+ $body = '';
+ break;
+ case ('reply_all'):
+ if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) {
+ $send_to = $orig_header->getAddr_s('mail_followup_to');
} else {
- $send_to = $orig_header->getAddr_s('from');
+ $send_to_cc = replyAllString($orig_header);
+ $send_to_cc = decodeHeader($send_to_cc,false,false,true);
}
- }
- $send_to = decodeHeader($send_to,false,false,true);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $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);
- $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
- sqUnWordWrap($body); // unwrap and then reset it?!
- $body = '';
- $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
- foreach ($rewrap_body as $line) {
- if ($strip_sigs && substr($line,0,3) == '-- ') {
- break;
+ case ('reply'):
+ // skip this if send_to was already set right above here
+ if(!$send_to) {
+ $send_to = $orig_header->reply_to;
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else {
+ $send_to = $orig_header->getAddr_s('from');
+ }
}
- sqWordWrap($line, ($editor_size));
- if (preg_match("/^(>+)/", $line, $matches)) {
- $gt = $matches[1];
- $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n";
- } else {
- $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n";
+ $send_to = decodeHeader($send_to,false,false,true);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $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);
+ $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
+ $body = '';
+ $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
+ foreach ($rewrap_body as $line) {
+ if ($strip_sigs && substr($line,0,3) == '-- ') {
+ break;
+ }
+ if (preg_match("/^(>+)/", $line, $matches)) {
+ $gt = $matches[1];
+ $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n";
+ } else {
+ $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n";
+ }
}
- }
- $body = getReplyCitation($from , $orig_header->date) . $body;
- $composeMessage->reply_rfc822_header = $orig_header;
- break;
- default:
- break;
+ //rewrap the body to clean up quotations and line lengths
+ $body = sqBodyWrap ($body, $editor_size);
+
+ $body = getReplyCitation($from , $orig_header->date) . $body;
+ $composeMessage->reply_rfc822_header = $orig_header;
+
+ break;
+ default:
+ break;
}
$compose_messages[$session] = $composeMessage;
sqsession_register($compose_messages, 'compose_messages');
@@ -818,63 +811,63 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
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 );
+ '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, &$composeMessage, $passed_id, $entities, $imapConnection) {
- global $attachment_dir, $username, $data_dir, $squirrelmail_language;
+ global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!count($message->entities) ||
- ($message->type0 == 'message' && $message->type1 == 'rfc822')) {
+ ($message->type0 == 'message' && $message->type1 == 'rfc822')) {
if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
- switch ($message->type0) {
- case 'message':
- if ($message->type1 == 'rfc822') {
- $filename = $message->rfc822_header->subject;
- if ($filename == "") {
- $filename = "untitled-".$message->entity_id;
+ switch ($message->type0) {
+ case 'message':
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject;
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id;
+ }
+ $filename .= '.msg';
+ } else {
+ $filename = $message->getFilename();
}
- $filename .= '.msg';
- } else {
- $filename = $message->getFilename();
- }
- break;
- default:
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
- $filename = $message->getFilename();
- break;
- }
- $filename = str_replace(' ', ' ', decodeHeader($filename));
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
- $filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
- }
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- while (file_exists($full_localfilename)) {
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- }
- $message->att_local_name = $full_localfilename;
-
- $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
- $full_localfilename);
-
- /* Write Attachment to file */
- $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
- fputs($fp, decodeBody(mime_fetch_body($imapConnection,
- $passed_id, $message->entity_id),
- $message->header->encoding));
- fclose ($fp);
+ break;
+ default:
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
+ $filename = $message->getFilename();
+ break;
+ }
+ $filename = str_replace(' ', ' ', decodeHeader($filename));
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) {
+ $filename = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $filename);
+ }
+ $localfilename = GenerateRandomString(32, '', 7);
+ $full_localfilename = "$hashed_attachment_dir/$localfilename";
+ while (file_exists($full_localfilename)) {
+ $localfilename = GenerateRandomString(32, '', 7);
+ $full_localfilename = "$hashed_attachment_dir/$localfilename";
+ }
+ $message->att_local_name = $full_localfilename;
+
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $full_localfilename);
+
+ /* Write Attachment to file */
+ $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
+ fputs($fp, decodeBody(mime_fetch_body($imapConnection,
+ $passed_id, $message->entity_id),
+ $message->header->encoding));
+ fclose ($fp);
}
} else {
for ($i=0, $entCount=count($message->entities); $i<$entCount;$i++) {
@@ -885,18 +878,18 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
}
function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
- $passed_ent_id='', $imapConnection) {
- global $attachments, $attachment_dir, $username, $data_dir;
+ $passed_ent_id='', $imapConnection) {
+ global $attachment_dir, $username, $data_dir;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
$body_a = sqimap_run_command($imapConnection,
- 'FETCH '.$passed_id.' RFC822',
- TRUE, $response, $readmessage,
- TRUE);
+ 'FETCH '.$passed_id.' RFC822',
+ TRUE, $response, $readmessage,
+ TRUE);
} else {
$body_a = sqimap_run_command($imapConnection,
- 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
- TRUE, $response, $readmessage, TRUE);
+ 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
+ TRUE, $response, $readmessage, TRUE);
$message = $message->parent;
}
if ($response == 'OK') {
@@ -912,50 +905,49 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
fwrite ($fp, $body);
fclose($fp);
$composeMessage->initAttachment('message/rfc822',$subject.'.msg',
- $full_localfilename);
+ $full_localfilename);
}
return $composeMessage;
}
function showInputForm ($session, $values=false) {
- global $send_to, $send_to_cc, $body, $startMessage,
- $passed_body, $color, $use_signature, $signature, $prefix_sig,
- $editor_size, $editor_height, $attachments, $subject, $newmail,
- $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
- $from_htmladdr_search, $location_of_buttons, $attachment_dir,
- $username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
- $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
- $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
- $username, $compose_messages, $composesession, $default_charset;
+ global $send_to, $send_to_cc, $body, $startMessage, $action,
+ $color, $use_signature, $signature, $prefix_sig,
+ $editor_size, $editor_height, $subject, $newmail,
+ $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
+ $from_htmladdr_search, $location_of_buttons, $attachment_dir,
+ $username, $data_dir, $identity, $idents, $delete_draft,
+ $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
+ $username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
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 = (int) $values['identity'];
+ $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 = (int) $values['identity'];
} else {
- $send_to = decodeHeader($send_to, true, false);
- $send_to_cc = decodeHeader($send_to_cc, true, false);
- $send_to_bcc = decodeHeader($send_to_bcc, true, false);
+ $send_to = decodeHeader($send_to, true, false);
+ $send_to_cc = decodeHeader($send_to_cc, true, false);
+ $send_to_bcc = decodeHeader($send_to_bcc, true, false);
}
if ($use_javascript_addr_book) {
- echo "\n". '\n\n";
+ echo "\n". '\n\n";
}
echo "\n" . '
\n";
+ addHidden('composesession', $composesession).
+ addHidden('querystring', $queryString).
+ "\n";
if (!(bool) ini_get('file_uploads')) {
- /* File uploads are off, so we didn't show that part of the form.
- To avoid bogus bug reports, tell the user why. */
- echo 'Because PHP file uploads are turned off, you can not attach files ';
- echo "to this message. Please see your system administrator for details.\r\n";
+ /* File uploads are off, so we didn't show that part of the form.
+ To avoid bogus bug reports, tell the user why. */
+ echo 'Because PHP file uploads are turned off, you can not attach files ';
+ echo "to this message. Please see your system administrator for details.\r\n";
}
do_hook('compose_bottom');
- echo '