X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=c0fe87952aa498403fc8147a609d99a1287fe573;hp=5e094f27ddbb715f366d44eacb5d1d443d225f7a;hb=39bfea8fa9fd939da9766a79381f68ea4b725c23;hpb=df96b37ae22acc31a2ad6b09379e6b60866ee4f4 diff --git a/src/compose.php b/src/compose.php index 5e094f27..c0fe8795 100644 --- a/src/compose.php +++ b/src/compose.php @@ -14,11 +14,14 @@ * - Send mail * - Save As Draft * - * $Id$ + * @version $Id$ * @package squirrelmail */ -/** Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -98,6 +101,8 @@ if ( !sqgetGlobalVar('smaction',$action) ) 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) */ @@ -319,7 +324,7 @@ 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&sort=$sort&startMessage=1&saved_draft=yes"); + "&message=$delete_draft&startMessage=1&saved_draft=yes"); exit(); } else { @@ -328,7 +333,7 @@ if ($draft) { exit(); } else { - Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". + Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . "&startMessage=1¬e=".urlencode($draft_message)); exit(); } @@ -351,39 +356,25 @@ if ($send) { 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. + /** + * If the browser doesn't support "VIRTUAL" as the wrap type. + * then the line length will be longer than $editor_size + * almost all browsers support VIRTUAL, so remove the line by line checking + * If this causes a problem, call sqBodyWrap */ - $body = explode("\n", $body); - $newBody = ''; - foreach ($body as $line) { - if( $line <> '-- ' ) { - $line = rtrim($line); - } - if (strlen($line) <= $editor_size + 1) { - $newBody .= $line . "\n"; - } else { - sqWordWrap($line, $editor_size); - $newBody .= $line . "\n"; - - } - - } - $body = $newBody; + // sqBodyWrap($body, $editor_size); $composeMessage=$compose_messages[$session]; @@ -395,7 +386,7 @@ if ($send) { unset($compose_messages[$session]); if ( isset($delete_draft)) { Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). - "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); + "&message=$delete_draft&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { @@ -403,7 +394,7 @@ if ($send) { Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". + Header("Location: $location/right_main.php?mailbox=$urlMailbox". "&startMessage=$startMessage&mail_sent=yes"); } } else { @@ -575,9 +566,16 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se global $editor_size, $default_use_priority, $body, $idents, $use_signature, $composesession, $data_dir, $username, $username, $key, $imapServerAddress, $imapPort, $compose_messages, - $composeMessage; + $composeMessage, $body_quote; global $languages, $squirrelmail_language, $default_charset; + /* + * Set $default_charset to correspond with the user's selection + * of language interface. $default_charset global is not correct, + * if message is composed in new window. + */ + set_my_charset(); + $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; @@ -619,21 +617,23 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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); 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); } } @@ -644,7 +644,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){ - $bodypart = charset_decode($actual,$bodypart); + $bodypart = charset_convert($actual,$bodypart,$default_charset,false); } $body .= $bodypart; @@ -661,6 +661,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $identity = ''; $from_o = $orig_header->from; + if (is_array($from_o)) { + if (isset($from_o[0])) { + $from_o = $from_o[0]; + } + } if (is_object($from_o)) { $orig_from = $from_o->getAddress(); } else { @@ -682,8 +687,6 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se if ($identity_match) { $identity = $identity_match; } - // we need identiy here fore draft case #845290 - // echo $identity."leer"; } switch ($action) { @@ -707,20 +710,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } } $subject = decodeHeader($orig_header->subject,false,false,true); -// /* remember the references and in-reply-to headers in case of an reply */ + ///* 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); + //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'): @@ -731,14 +725,18 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $mailprio = $orig_header->priority; $orig_from = ''; $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); - sqUnWordWrap($body); + //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; - sqUnWordWrap($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'): @@ -775,21 +773,23 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se /* 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; } - sqWordWrap($line, ($editor_size)); if (preg_match("/^(>+)/", $line, $matches)) { $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n"; + $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n"; } else { - $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n"; + $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n"; } } + + //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; @@ -840,8 +840,8 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap } $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); + 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"; @@ -929,14 +929,14 @@ function showInputForm ($session, $values=false) { } if ($use_javascript_addr_book) { - echo "\n". '\n\n"; + "// -->\n\n\n"; } echo "\n" . '
'. _("Draft Saved").'
'; + echo '
'. _("Draft Saved").'
'; } if ($mail_sent == 'yes') { - echo '
'. _("Your Message has been sent.").'
'; + echo '
'. _("Your Message has been sent.").'
'; } echo '' . "\n"; if ($compose_new_win == '1') { - echo '
'."\n" . - ' '. html_tag( 'td', '', 'right' ) . ''."\n"; + echo '
'."\n" . + ' '. html_tag( 'td', '', 'right' ) . ''."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -978,24 +978,25 @@ function showInputForm ($session, $values=false) { /* display select list for identities */ if (count($idents) > 1) { - $ident_list = array(); - foreach($idents as $id => $data) { - $ident_list[$id] = - $data['full_name'].' <'.$data['email_address'].'>'; - } + $ident_list = array(); + foreach($idents as $id => $data) { + $ident_list[$id] = + $data['full_name'].' <'.$data['email_address'].'>'; + } echo ' ' . "\n" . html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . _("From:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . - ' '. - addSelect('identitiy', $ident_list, $identity, TRUE); + ' '. + addSelect('identity', $ident_list, $identity, TRUE); echo ' ' . "\n" . ' ' . "\n"; } + echo ' ' . "\n" . html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . - _("To:") . '' . "\n" . + _("To:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . addInput('send_to', $send_to, 60). '
' . "\n" . ' ' . "\n" . @@ -1004,14 +1005,14 @@ function showInputForm ($session, $values=false) { html_tag( 'td', '', 'right', $color[4] ) . _("CC:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - addInput('send_to_cc', $send_to_cc, 60). '
' . "\n" . + addInput('send_to_cc', $send_to_cc, 60). '
' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . html_tag( 'td', '', 'right', $color[4] ) . _("BCC:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - addInput('send_to_bcc', $send_to_bcc, 60).'
' . "\n" . + addInput('send_to_bcc', $send_to_bcc, 60).'
' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . @@ -1028,16 +1029,16 @@ function showInputForm ($session, $values=false) { /* why this distinction? */ if ($compose_new_win == '1') { - echo ' ' . "\n" . - '
' . "\n" . - '