X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=ca4ee2342fabe91d0bdd086aa07d81fbddcf2eb0;hb=5618924b145306eb730041f2022fadcad4715acd;hp=e53592f376c00e0d719d09039427810432066757;hpb=98fb28fd4ec24a6026af074e879855ce36555bc5;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index e53592f3..ca4ee234 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -22,6 +22,7 @@ define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
@@ -31,75 +32,63 @@ require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
/* --------------------- Get globals ------------------------------------- */
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
-
-if (isset($_POST['return'])) {
- $html_addr_search_done = 'Use Addresses';
-}
-if ( isset($_SESSION['composesession']) ) {
- $composesession = $_SESSION['composesession'];
-}
-sqextractGlobalVar('action');
-sqextractGlobalVar('session');
-sqextractGlobalVar('mailbox');
-sqextractGlobalVar('identity');
-sqextractGlobalVar('send_to');
-sqextractGlobalVar('send_to_cc');
-sqextractGlobalVar('send_to_bcc');
-sqextractGlobalVar('subject');
-sqextractGlobalVar('body');
-sqextractGlobalVar('mailprio');
-sqextractGlobalVar('request_mdn');
-sqextractGlobalVar('request_dr');
-sqextractGlobalVar('html_addr_search');
-sqextractGlobalVar('mail_sent');
-sqextractGlobalVar('passed_id');
-sqextractGlobalVar('passed_ent_id');
-sqextractGlobalVar('send');
-
-if ( isset($_POST['sigappend']) ) {
- $sigappend = $_POST['sigappend'];
-}
-/* From addressbook search */
-if ( isset($_POST['from_htmladdr_search']) ) {
- $from_htmladdr_search = $_POST['from_htmladdr_search'];
-}
-if ( isset($_POST['addr_search_done']) ) {
- $html_addr_search_done = $_POST['addr_search_done'];
-}
-if ( isset($_POST['send_to_search']) ) {
- $send_to_search = &$_POST['send_to_search'];
+/** COOKIE VARS */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+
+/** SESSION VARS */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+
+sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
+sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+
+/** SESSION/POST/GET VARS */
+sqgetGlobalVar('action',$action);
+sqgetGlobalVar('session',$session);
+sqgetGlobalVar('mailbox',$mailbox);
+sqgetGlobalVar('identity',$identity);
+sqgetGlobalVar('send_to',$send_to);
+sqgetGlobalVar('send_to_cc',$send_to_cc);
+sqgetGlobalVar('send_to_bcc',$send_to_bcc);
+sqgetGlobalVar('subject',$subject);
+sqgetGlobalVar('body',$body);
+sqgetGlobalVar('mailprio',$mailprio);
+sqgetGlobalVar('request_mdn',$request_mdn);
+sqgetGlobalVar('request_dr',$request_dr);
+sqgetGlobalVar('html_addr_search',$html_addr_search);
+sqgetGlobalVar('mail_sent',$mail_sent);
+sqgetGlobalVar('passed_id',$passed_id);
+sqgetGlobalVar('passed_ent_id',$passed_ent_id);
+sqgetGlobalVar('send',$send);
+
+sqgetGlobalVar('attach',$attach);
+
+sqgetGlobalVar('draft',$draft);
+sqgetGlobalVar('draft_id',$draft_id);
+sqgetGlobalVar('ent_num',$ent_num);
+sqgetGlobalVar('saved_draft',$saved_draft);
+sqgetGlobalVar('delete_draft',$delete_draft);
+
+
+/** POST VARS */
+sqgetGlobalVar('sigappend', $sigappend, SQ_POST);
+sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST);
+sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST);
+sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST);
+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';
}
-/* Attachments */
-sqextractGlobalVar('attach');
-if ( isset($_POST['do_delete']) ) {
- $do_delete = $_POST['do_delete'];
-}
-if ( isset($_POST['delete']) ) {
- $delete = &$_POST['delete'];
-}
-if ( isset($_SESSION['compose_messages']) ) {
- $compose_messages = &$_SESSION['compose_messages'];
-}
+/** GET VARS */
+sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
-
-/* Forward message as attachment */
-if ( isset($_GET['attachedmessages']) ) {
- $attachedmessages = $_GET['attachedmessages'];
-}
-
-/* Drafts */
-sqextractGlobalVar('draft');
-sqextractGlobalVar('draft_id');
-sqextractGlobalVar('ent_num');
-sqextractGlobalVar('saved_draft');
-sqextractGlobalVar('delete_draft');
-
-$key = $_COOKIE['key'];
+/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
+$location = get_location();
/* --------------------- Specific Functions ------------------------------ */
@@ -122,7 +111,7 @@ function replyAllString($header) {
$excl_ar[$email_address] = '';
$idents = getPref($data_dir, $username, 'identities');
if ($idents != '' && $idents > 1) {
- $first_id = false;
+ $first_id = false;
for ($i = 1; $i < $idents; $i ++) {
$cur_email_address = getPref($data_dir, $username,
'email_address' . $i);
@@ -143,15 +132,53 @@ function replyAllString($header) {
$url_replytoallcc = '';
foreach( $url_replytoall_ar as $email => $personal) {
if ($personal) {
- $url_replytoallcc .= ", \"$personal\" <$email>";
+ $url_replytoallcc .= ", $personal <$email>";
} else {
$url_replytoallcc .= ', '. $email;
}
}
$url_replytoallcc = substr($url_replytoallcc,2);
+
return $url_replytoallcc;
}
+function getReplyCitation($orig_from) {
+ global $reply_citation_style, $reply_citation_start, $reply_citation_end;
+ $orig_from = decodeHeader($orig_from->getAddress(false),false,false);
+// $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 '';
+ }
+
+ /* Make sure our final value isn't an empty string. */
+ if ($orig_from == '') {
+ return '';
+ }
+
+ /* 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 '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");
+}
+
function getforwardHeader($orig_header) {
global $editor_size;
@@ -164,21 +191,25 @@ function getforwardHeader($orig_header) {
$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);
+ $from = str_replace(' ',' ',$from);
+ $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false);
+ $to = str_replace(' ',' ',$to);
+ $subject = decodeHeader($orig_header->subject,false,false);
+ $subject = str_replace(' ',' ',$subject);
$bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\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 .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";
+ "\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);
+ $cc = str_replace(' ',' ',$cc);
+ $bodyTop .= $display[_("Cc")] .$cc . "\n";
}
$bodyTop .= str_pad('', $editor_size -2 , '-') .
- "\n";
+ "\n\n";
return $bodyTop;
}
/* ----------------------------------------------------------------------- */
@@ -188,7 +219,7 @@ function getforwardHeader($orig_header) {
* vars.
*/
if (sqsession_is_registered('session_expired_post')) {
- $session_expired_post = $_SESSION['session_expired_post'];
+ sqgetGlobalVar('session_expired_post', $session_expired_post, SQ_SESSION);
/*
* extra check for username so we don't display previous post data from
* another user during this session.
@@ -272,17 +303,17 @@ if ($draft) {
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode($draft_folder) .
+ Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) .
"&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes");
exit();
}
else {
if ($compose_new_win == '1') {
- Header("Location: compose.php?saved_draft=yes&session=$composesession");
+ Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
exit();
}
else {
- Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort".
"&startMessage=1¬e=".urlencode($draft_message));
exit();
}
@@ -297,10 +328,10 @@ if ($send) {
$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;
@@ -333,29 +364,31 @@ if ($send) {
} else {
sqWordWrap($line, $editor_size);
$newBody .= $line . "\n";
+
}
+
}
$body = $newBody;
- do_hook('compose_send');
+
$composeMessage=$compose_messages[$session];
- $Result = deliverMessage($composeMessage);
+ $Result = deliverMessage($composeMessage);
if (! $Result) {
showInputForm($session);
exit();
}
unset($compose_messages[$session]);
if ( isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ).
+ Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ).
"&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes");
exit();
}
if ($compose_new_win == '1') {
- Header("Location: compose.php?mail_sent=yes");
+ Header("Location: $location/compose.php?mail_sent=yes");
}
else {
- Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
"&startMessage=1");
}
} else {
@@ -457,17 +490,17 @@ elseif (isset($sigappend)) {
if (isset($delete) && is_array($delete)) {
$composeMessage = $compose_messages[$session];
foreach($delete as $index) {
- $attached_file = $composeMessage->entities[$index]->att_local_name;
+ $attached_file = $composeMessage->entities[$index]->att_local_name;
unlink ($attached_file);
- unset ($composeMessage->entities[$index]);
+ unset ($composeMessage->entities[$index]);
}
- $new_entities = array();
- foreach ($composeMessage->entities as $entity) {
- $new_entities[] = $entity;
- }
- $composeMessage->entities = $new_entities;
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages, 'compose_messages');
+ $new_entities = array();
+ foreach ($composeMessage->entities as $entity) {
+ $new_entities[] = $entity;
+ }
+ $composeMessage->entities = $new_entities;
+ $compose_messages[$session] = $composeMessage;
+ sqsession_register($compose_messages, 'compose_messages');
}
showInputForm($session);
} else {
@@ -509,6 +542,9 @@ elseif (isset($sigappend)) {
if (isset($send_to_bcc)) {
$values['send_to_bcc'] = $send_to_bcc;
}
+ if (isset($subject)) {
+ $values['subject'] = $subject;
+ }
showInputForm($session, $values);
}
@@ -522,7 +558,8 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
global $editor_size, $default_use_priority, $body,
$use_signature, $composesession, $data_dir, $username,
$username, $key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage;
+ $composeMessage;
+ global $languages, $squirrelmail_language;
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
@@ -533,7 +570,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-
+
$body = '';
if ($passed_ent_id) {
/* redefine the messsage in case of message/rfc822 */
@@ -560,7 +597,7 @@ 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;
@@ -570,8 +607,15 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$bodypart = decodeBody($unencoded_bodypart,
$body_part_entity->header->encoding);
if ($type1 == 'html') {
+ $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart);
$bodypart = strip_tags($bodypart);
}
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ if (mb_detect_encoding($bodypart) != 'ASCII') {
+ $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
+ }
+ }
$body .= $bodypart;
}
if ($default_use_priority) {
@@ -592,35 +636,38 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
} else {
$orig_from = '';
}
- $identities = array();
+ $identities = array();
if (!empty($idents) && $idents > 1) {
$identities[] = '"'. getPref($data_dir, $username, 'full_name')
- . '" <' . getPref($data_dir, $username, 'email_address') . '>';
- for ($i = 1; $i < $idents; $i++) {
+ . '" <' . getPref($data_dir, $username, 'email_address') . '>';
+ for ($i = 1; $i < $idents; $i++) {
$enc_from_name = '"'.
- getPref($data_dir, $username, 'full_name' . $i) .
- '" <' .
- getPref($data_dir, $username, 'email_address' . $i) . '>';
+ getPref($data_dir, $username, 'full_name' . $i) .
+ '" <' .
+ getPref($data_dir, $username, 'email_address' . $i) . '>';
if ($enc_from_name == $orig_from && $i) {
$identity = $i;
break;
}
- $identities[] = $enc_from_name;
+ $identities[] = $enc_from_name;
+ }
+ $identity_match = $orig_header->findAddress($identities);
+ if ($identity_match) {
+ $identity = $identity_match;
}
- $identity_match = $orig_header->findAddress($identities);
- if ($identity_match) {
- $identity = $identity_match;
- }
}
switch ($action) {
case ('draft'):
$use_signature = FALSE;
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
-
+ $composeMessage->rfc822_header = $orig_header;
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
+ $subject = decodeHeader($orig_header->subject,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 = '';
@@ -635,10 +682,10 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
break;
case ('edit_as_new'):
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
+ $subject = decodeHeader($orig_header->subject,false,true);
$mailprio = $orig_header->priority;
$orig_from = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
@@ -646,8 +693,8 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
break;
case ('forward'):
$send_to = '';
- $subject = decodeHeader($orig_header->subject);
- if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ $subject = decodeHeader($orig_header->subject,false,true);
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
@@ -655,7 +702,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$body = getforwardHeader($orig_header) . $body;
sqUnWordWrap($body);
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- $body = "\n" . $body;
+ $body = "\n" . $body;
break;
case ('forward_as_attachment'):
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
@@ -663,16 +710,18 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
break;
case ('reply_all'):
$send_to_cc = replyAllString($orig_header);
+ $send_to_cc = decodeHeader($send_to_cc,false,true);
case ('reply'):
$send_to = $orig_header->reply_to;
if (is_array($send_to) && count($send_to)) {
- $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+ $send_to = $orig_header->getAddr_s('reply_to');
} else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */
- $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
- } else {
- $send_to = decodeHeader($orig_header->getAddr_s('from'));
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else {
+ $send_to = $orig_header->getAddr_s('from');
}
- $subject = decodeHeader($orig_header->subject);
+ $send_to = decodeHeader($send_to,false,true);
+ $subject = decodeHeader($orig_header->subject,false,true);
$subject = str_replace('"', "'", $subject);
$subject = trim($subject);
if (substr(strtolower($subject), 0, 3) != 're:') {
@@ -680,10 +729,9 @@ 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;
- $body = getReplyCitation($from->getAddress(false));
+ $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
sqUnWordWrap($body);
+ $body = '';
$cnt = count($rewrap_body);
for ($i=0;$i<$cnt;$i++) {
sqWordWrap($rewrap_body[$i], ($editor_size));
@@ -695,13 +743,15 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
}
unset($rewrap_body[$i]);
}
+ $body = getReplyCitation($from) . $body;
$composeMessage->reply_rfc822_header = $orig_header;
+
break;
- default:
+ default:
break;
}
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages, 'compose_messages');
+ $compose_messages[$session] = $composeMessage;
+ sqsession_register($compose_messages, 'compose_messages');
session_write_close();
sqimap_logout($imapConnection);
}
@@ -722,39 +772,39 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
if (!count($message->entities) ||
($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 = decodeHeader($message->rfc822_header->subject.'.eml');
+ switch ($message->type0) {
+ case 'message':
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject.'.eml';
if ($filename == "") {
$filename = "untitled-".$message->entity_id.'.eml';
}
- } else {
- $filename = decodeHeader($message->getFilename());
+ } else {
+ $filename = $message->getFilename();
}
- break;
- default:
- $filename = decodeHeader($message->getFilename());
- break;
- }
+ break;
+ default:
+ $filename = $message->getFilename();
+ break;
+ }
+ $filename = decodeHeader($filename);
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($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;
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
-
- $composeMessage->addEntity($message);
-
+ $message->att_local_name = $full_localfilename;
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
+
+ $composeMessage->addEntity($message);
+
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
@@ -767,7 +817,6 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
$composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection);
}
}
-// setPref($data_dir, $username, 'attachments', serialize($attachments));
return $composeMessage;
}
@@ -786,7 +835,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
TRUE, $response, $readmessage, $uid_support);
$message = $message->parent;
}
- if ($response = 'OK') {
+ if ($response == 'OK') {
$subject = encodeHeader($message->rfc822_header->subject);
array_shift($body_a);
$body = implode('', $body_a) . "\r\n";
@@ -797,8 +846,8 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$fp = fopen( $full_localfilename, 'w');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
- $full_localfilename);
+ $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+ $full_localfilename);
}
return $composeMessage;
}
@@ -816,7 +865,6 @@ function showInputForm ($session, $values=false) {
$composeMessage = $compose_messages[$session];
- $subject = decodeHeader($subject, false);
if ($values) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
@@ -825,6 +873,10 @@ function showInputForm ($session, $values=false) {
$mailprio = $values['mailprio'];
$body = $values['body'];
$identity = (int) $values['identity'];
+ } else {
+ $send_to = decodeHeader($send_to);
+ $send_to_cc = decodeHeader($send_to_cc);
+ $send_to_bcc = decodeHeader($send_to_bcc);
}
if ($use_javascript_addr_book) {
@@ -873,73 +925,85 @@ function showInputForm ($session, $values=false) {
showComposeButtonRow();
}
+ /* display select list for identities */
$idents = getPref($data_dir, $username, 'identities', 0);
if ($idents > 1) {
- echo '
' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
- _("From:") . '' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
- ' ' . "\n" .
- ' ' .
- htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+ $fn = getPref($data_dir, $username, 'full_name');
$em = getPref($data_dir, $username, 'email_address');
+ echo ' ' . "\n" .
+ html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
+ _("From:") . '' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
+ ' ' . "\n" .
+ ' ' .
+ htmlspecialchars($fn);
if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
+ if($fn != '') {
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ } else {
+ echo htmlspecialchars($em) . "\n";
+ }
}
for ($i = 1; $i < $idents; $i ++) {
+ $fn = getPref($data_dir, $username, 'full_name' . $i);
+ $em = getPref($data_dir, $username, 'email_address' . $i);
+
echo ' ' . htmlspecialchars(getPref($data_dir, $username,
- 'full_name' . $i));
- $em = getPref($data_dir, $username, 'email_address' . $i);
+ echo '>' . htmlspecialchars($fn);
if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
+ if($fn != '') {
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ } else {
+ echo htmlspecialchars($em) . "\n";
+ }
}
echo ' ';
}
echo ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n";
+ ' ' . "\n" .
+ ' ' . "\n";
}
- echo ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
+ echo ' ' . "\n" .
+ html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("To:") . '' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("CC:") . '' . "\n" .
+ _("CC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("BCC:") . '' . "\n" .
+ _("BCC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("Subject:") . '' . "\n" .
+ _("Subject:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) . "\n";
- echo ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n\n";
+ echo ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n\n";
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
+ /* why this distinction? */
if ($compose_new_win == '1') {
echo ' ' . "\n" .
' ' . "\n" .
@@ -952,6 +1016,7 @@ function showInputForm ($session, $values=false) {
' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n";
+ echo ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n";
+
if ($location_of_buttons == 'bottom') {
showComposeButtonRow();
} else {
- echo ' ' . "\n" .
- html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n";
+ echo ' ' . "\n" .
+ html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n";
}
/* This code is for attachments */
- if ((bool) ini_get('file_uploads')) {
- echo ' ' . "\n" .
- ' ' . "\n" .
+ if ((bool) ini_get('file_uploads')) {
+
+ /* Calculate the max size for an uploaded file.
+ * This is advisory for the user because we can't actually prevent
+ * people to upload too large files. */
+ $sizes = array();
+ /* 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 */
+ if( $size = getByteSize(ini_get($var)) ) {
+ $sizes[] = $size;
+ }
+ }
+
+ if(count($sizes) > 0) {
+ $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')';
+ } else {
+ $maxsize = '';
+ }
+
+ echo ' ' . "\n" .
+ ' ' . "\n" .
' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n" .
' ' . "\n" .
- ' ' . "\n" .
- html_tag( 'td', '', 'right', '', 'VALIGN=MIDDLE' ) .
- _("Attach:") . '' . "\n" .
- html_tag( 'td', '', 'left', '', 'VALIGN=MIDDLE' ) .
- ' ' . "\n" .
+ ' ' . "\n" .
+ html_tag( 'td', '', 'right', '', 'valign="middle"' ) .
+ _("Attach:") . '' . "\n" .
+ html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
+ ' ' . "\n" .
' ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n";
+ $maxsize .
+ ' ' . "\n" .
+ ' ' . "\n";
$s_a = array();
if ($composeMessage->entities) {
foreach ($composeMessage->entities as $key => $attachment) {
$attached_file = $attachment->att_local_name;
- if ($attachment->att_local_name || $attachment->body_part) {
- $attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
- $type = $attachment->mime_header->type0.'/'.
- $attachment->mime_header->type1;
+ if ($attachment->att_local_name || $attachment->body_part) {
+ $attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
+ $type = $attachment->mime_header->type0.'/'.
+ $attachment->mime_header->type1;
- $s_a[] = ''."\n";
+ $s_a[] = ''."\n";
}
}
}
@@ -1049,7 +1136,7 @@ td> ' . $type . ' ('.show_readable_size( filesize( $attached_file )
'
' . "\n" .
' ' . "\n" .
' ' . "\n";
- } // End of file_uploads if-block
+ } // End of file_uploads if-block
/* End of attachment code */
if ($compose_new_win == '1') {
echo '
'."\n";
@@ -1064,9 +1151,10 @@ td> ' . $type . ' ('.show_readable_size( filesize( $attached_file )
store the complete ComposeMessages array in a hidden input value
so we can restore them in case of a session timeout.
*/
+ sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER);
echo ' \n";
echo ' \n";
- echo ' \n";
+ echo ' \n";
echo '';
if (!(bool) ini_get('file_uploads')) {
/* File uploads are off, so we didn't show that part of the form.
@@ -1075,7 +1163,6 @@ td> ' . $type . ' ('.show_readable_size( filesize( $attached_file )
echo "to this message. Please see your system administrator for details.\r\n";
}
-
do_hook('compose_bottom');
echo '