X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=53581cb83a268fd09e2b3e3edb60d65d1e29e447;hb=8654383dd9cfe18b98c44d6d58ed2980b0890028;hp=f021327112b7c92274320e785f0fd05d099cd136;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index f0213271..53581cb8 100644 --- a/src/compose.php +++ b/src/compose.php @@ -157,10 +157,27 @@ function replyAllString($header) { return $url_replytoallcc; } +/** + * creates top line in reply citations + * + * Line style depends on user preferences. + * $orig_date argument is available only from 1.4.3 and 1.5.1 version. + * @param object $orig_from From: header object. + * @param integer $orig_date email's timestamp + * @return string reply citation + */ function getReplyCitation($orig_from, $orig_date) { global $reply_citation_style, $reply_citation_start, $reply_citation_end; - $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); + + // FIXME: why object is rewritten with string. + if (!is_object($orig_from)) { + $orig_from = ''; + } else { + $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); + } + // $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); + /* First, return an empty string when no citation style selected. */ if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { return ''; @@ -173,39 +190,60 @@ 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 ''; - } - - /* Build and return the citation string. */ - return ($start . $orig_from . $end . "\n"); + case 'author_said': + /** + * To translators: %s is for author's name + */ + $full_reply_citation = sprintf(_("%s wrote:"),$orig_from); + break; + case 'quote_who': + // FIXME: do we have to translate xml formating? + $start = '<' . _("quote") . ' ' . _("who") . '="'; + $end = '">'; + $full_reply_citation = $start . $orig_from . $end; + break; + case 'date_time_author': + /** + * To translators: + * first %s is for date string, second %s is for author's name. Date uses + * formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations. + * Example string: + * "On Sat, December 24, 2004 23:59, Santa wrote:" + * If you have to put author's name in front of date string, check comments about + * argument swapping at http://www.php.net/sprintf + */ + $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $orig_from); + break; + case 'user-defined': + $start = $reply_citation_start . + ($reply_citation_start == '' ? '' : ' '); + $end = $reply_citation_end; + $full_reply_citation = $start . $orig_from . $end; + break; + default: + return ''; + } + + /* Add line feed and return the citation string. */ + return ($full_reply_citation . "\n"); } +/** + * Creates header fields in forwarded email body + * + * $default_charset global must be set correctly before you call this function. + * @param object $orig_header + * @return $string + */ function getforwardHeader($orig_header) { - global $editor_size; - - $display = array( _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), - _("Cc") => strlen(_("Cc")) ); + global $editor_size, $default_charset; + + // using own strlen function in order to detect correct string length + $display = array( _("Subject") => sq_strlen(_("Subject"),$default_charset), + _("From") => sq_strlen(_("From"),$default_charset), + _("Date") => sq_strlen(_("Date"),$default_charset), + _("To") => sq_strlen(_("To"),$default_charset), + _("Cc") => sq_strlen(_("Cc"),$default_charset) ); $maxsize = max($display); $indent = str_pad('',$maxsize+2); foreach($display as $key => $val) { @@ -217,7 +255,9 @@ function getforwardHeader($orig_header) { $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) . + + // using own str_pad function in order to create correct string pad + $bodyTop = sq_str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH,$default_charset) . "\n". $display[_("Subject")] . $subject . "\n" . $display[_("From")] . $from . "\n" . $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . @@ -272,7 +312,13 @@ if (sqsession_is_registered('session_expired_post')) { if ($compose_new_win == '1') { compose_Header($color, $mailbox); } else { - displayPageHeader($color, $mailbox); + $sHeaderJs = (isset($sHeaderJs)) ? $sHeaderJs : ''; + if (strpos($action, 'reply') !== false && $reply_focus) { + $sBodyTagJs = 'onload="checkForm(\''.$replyfocus.'\');"'; + } else { + $sBodyTagJs = 'onload="checkForm();"'; + } + displayPageHeader($color, $mailbox,$sHeaderJs,$sBodyTagJs); } showInputForm($session, false); exit(); @@ -291,6 +337,7 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) { if (!isset($compose_messages)) { $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(); @@ -298,6 +345,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL) $composeMessage->rfc822_header = $rfc822_header; $composeMessage->reply_rfc822_header = ''; $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); } else { $composeMessage=$compose_messages[$session]; @@ -322,20 +370,24 @@ if ($draft) { $draft_message = _("Draft Email Saved"); /* 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"); - exit(); - } - else { - if ($compose_new_win == '1') { - Header("Location: $location/compose.php?saved_draft=yes&session=$composesession"); - exit(); - } - else { - Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . - "&startMessage=1¬e=".urlencode($draft_message)); - exit(); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); + sqimap_mailbox_select($imap_stream, $draft_folder); + // force bypass_trash=true because message should be saved when deliverMessage() returns true. + // in current implementation of sqimap_msgs_list_flag() single message id can + // be submitted as string. docs state that it should be array. + sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); + if ($auto_expunge) { + sqimap_mailbox_expunge($imap_stream, $draft_folder, true); } + sqimap_logout($imap_stream); + } + if ($compose_new_win == '1') { + Header("Location: $location/compose.php?saved_draft=yes&session=$composesession"); + exit(); + } else { + Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . + "&startMessage=1¬e=".urlencode($draft_message)); + exit(); } } } @@ -376,10 +428,10 @@ if ($send) { if( $line <> '-- ' ) { $line = rtrim($line); } - if (strlen($line) <= $editor_size + 1) { + if (sq_strlen($line,$default_charset) <= $editor_size + 1) { $newBody .= $line . "\n"; } else { - sqWordWrap($line, $editor_size); + sqWordWrap($line, $editor_size,$default_charset); $newBody .= $line . "\n"; } @@ -395,18 +447,24 @@ if ($send) { exit(); } unset($compose_messages[$session]); + /* if it is resumed draft, delete draft message */ if ( isset($delete_draft)) { - Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). - "&message=$delete_draft&startMessage=1&mail_sent=yes"); - exit(); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); + sqimap_mailbox_select($imap_stream, $draft_folder); + // bypass_trash=true because message should be saved when deliverMessage() returns true. + // in current implementation of sqimap_msgs_list_flag() single message id can + // be submitted as string. docs state that it should be array. + sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); + if ($auto_expunge) { + sqimap_mailbox_expunge($imap_stream, $draft_folder, true); + } + sqimap_logout($imap_stream); } if ($compose_new_win == '1') { - Header("Location: $location/compose.php?mail_sent=yes"); - } - else { + }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') { @@ -744,6 +802,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se // 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; @@ -821,6 +880,16 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se return ($ret); } /* function newMail() */ +/** + * downloads attachments from original message, stores them in attachment directory and adds + * them to composed message. + * @param object $message + * @param object $composeMessage + * @param integer $passed_id + * @param mixed $entities + * @param mixed $imapConnection + * @return object + */ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); @@ -864,9 +933,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap /* 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)); + mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp); fclose ($fp); } } else { @@ -920,6 +987,7 @@ function showInputForm ($session, $values=false) { $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']; @@ -1054,6 +1122,12 @@ function showInputForm ($session, $values=false) { $signature = $idents[$identity]['signature']; if ($sig_first == '1') { + /* + * FIXME: test is specific to ja_JP translation implementation. + * This test might apply incorrect conversion to other translations, but + * use of 7bit iso-2022-jp charset in other translations might have other + * issues too. + */ if ($default_charset == 'iso-2022-jp') { echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP'); } else { @@ -1063,6 +1137,7 @@ function showInputForm ($session, $values=false) { } else { echo "\n\n".htmlspecialchars(decodeHeader($body,false,false)); + // FIXME: test is specific to ja_JP translation implementation. See above comments. if ($default_charset == 'iso-2022-jp') { echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP'); }else{ @@ -1098,19 +1173,21 @@ function showInputForm ($session, $values=false) { /* php.ini vars which influence the max for uploads */ $configvars = array('post_max_size', 'memory_limit', 'upload_max_filesize'); foreach($configvars as $var) { - /* skip 0 or empty values */ + /* skip 0 or empty values, and -1 which means 'unlimited' */ if( $size = getByteSize(ini_get($var)) ) { - $sizes[] = $size; + if ( $size != '-1' ) { + $sizes[] = $size; + } } } if(count($sizes) > 0) { $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'; + echo addHidden('MAX_FILE_SIZE', min( $sizes )); } else { $maxsize = ''; } - echo addHidden('MAX_FILE_SIZE', min( $sizes )). - ' ' . "\n" . + echo ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . @@ -1183,8 +1260,9 @@ function showInputForm ($session, $values=false) { 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"; + echo '

' + . _("Because PHP file uploads are turned off, you can not attach files to this message. Please see your system administrator for details.") + . "

\r\n"; } do_hook('compose_bottom'); @@ -1273,7 +1351,6 @@ function checkInput ($show) { function saveAttachedFiles($session) { global $_FILES, $attachment_dir, $attachments, $username, $data_dir, $compose_messages; - /* get out of here if no file was attached at all */ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) { return true; @@ -1288,7 +1365,7 @@ function saveAttachedFiles($session) { } // FIXME: we SHOULD prefer move_uploaded_file over rename because - // m_u_f works better with restricted PHP installes (safe_mode, open_basedir) + // m_u_f works better with restricted PHP installs (safe_mode, open_basedir) if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) { if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) { return true; @@ -1345,12 +1422,12 @@ function getByteSize($ini_size) { } -/* temporary function to make use of the deliver class. - In the future the responsable backend should be automaticly loaded - and conf.pl should show a list of available backends. - The message also should be constructed by the message class. +/** + * temporary function to make use of the deliver class. + * In the future the responsable backend should be automaticly loaded + * and conf.pl should show a list of available backends. + * The message also should be constructed by the message class. */ - function deliverMessage($composeMessage, $draft=false) { global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body, $username, $popuser, $usernamedata, $identity, $idents, $data_dir, @@ -1499,7 +1576,7 @@ function deliverMessage($composeMessage, $draft=false) { } if (!$succes) { $msg = $deliver->dlv_msg . '
' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . $deliver->dlv_server_msg; plain_error_message($msg, $color); } else { @@ -1546,7 +1623,7 @@ function deliverMessage($composeMessage, $draft=false) { ClearAttachments($composeMessage); if ($action == 'reply' || $action == 'reply_all') { sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); + sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false); } sqimap_logout($imap_stream); }