X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=38e101f508c4c66309ccb8e41a63f052f3eba033;hp=a07c3872aed98acbfb04a3223f6c4501305d57d5;hb=50706f77ec7e6e107ec2d41691a9e3b125b7088f;hpb=73ad81bfac35a5bf41726731d87138fa716518f7 diff --git a/src/compose.php b/src/compose.php index a07c3872..38e101f5 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,7 +3,7 @@ /** * compose.php * - * Copyright (c) 1999-2004 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code sends a mail. @@ -118,7 +118,6 @@ function replyAllString($header) { /** * 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'); } @@ -158,10 +157,22 @@ 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; + + // FIXME: why object is rewritten with string. $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 ''; @@ -174,39 +185,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 said:"),$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 said:" + * 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 said:"), 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) { @@ -218,7 +250,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" . @@ -574,7 +608,7 @@ 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, + $use_signature, $data_dir, $username, $username, $key, $imapServerAddress, $imapPort, $compose_messages, $composeMessage, $body_quote; global $languages, $squirrelmail_language, $default_charset; @@ -623,7 +657,6 @@ 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) { @@ -823,8 +856,18 @@ 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; + 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')) { @@ -881,7 +924,7 @@ 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; + global $attachment_dir, $username, $data_dir; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!$passed_ent_id) { $body_a = sqimap_run_command($imapConnection, @@ -913,14 +956,13 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, } 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, + 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, $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, $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]; @@ -981,7 +1023,7 @@ function showInputForm ($session, $values=false) { if ($compose_new_win == '1') { echo ''."\n" . ' '.html_tag( 'td', '', 'right' ). - ''."\n"; } if ($location_of_buttons == 'top') { @@ -1057,6 +1099,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 { @@ -1066,6 +1114,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{ @@ -1101,19 +1150,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" . @@ -1186,8 +1237,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'); @@ -1291,7 +1343,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; @@ -1348,12 +1400,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, @@ -1463,7 +1515,7 @@ function deliverMessage($composeMessage, $draft=false) { if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech; + global $smtpServerAddress, $smtpPort, $pop_before_smtp; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; get_smtp_user($user, $pass);