}
}
- /**
+ /**
* 3) get the addresses.
*/
$url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar);
- /**
+ /**
* 4) generate the string.
*/
$url_replytoallcc = '';
if ($personal) {
$url_replytoallcc .= ", $personal <$email>";
} else {
- $url_replytoallcc .= ', '. $email;
+ $url_replytoallcc .= ', '. $email;
}
}
$url_replytoallcc = substr($url_replytoallcc,2);
-
+
return $url_replytoallcc;
}
$end = '">';
break;
case 'user-defined':
- $start = $reply_citation_start .
+ $start = $reply_citation_start .
($reply_citation_start == '' ? '' : ' ');
$end = $reply_citation_end;
break;
global $editor_size;
$display = array( _("Subject") => strlen(_("Subject")),
- _("From") => strlen(_("From")),
- _("Date") => strlen(_("Date")),
- _("To") => strlen(_("To")),
+ _("From") => strlen(_("From")),
+ _("Date") => strlen(_("Date")),
+ _("To") => strlen(_("To")),
_("Cc") => strlen(_("Cc")) );
$maxsize = max($display);
$indent = str_pad('',$maxsize+2);
$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);
+ $cc = str_replace(' ',' ',$cc);
$bodyTop .= $display[_("Cc")] .$cc . "\n";
}
$bodyTop .= str_pad('', $editor_size -2 , '-') .
/* ----------------------------------------------------------------------- */
/*
- * If the session is expired during a post this restores the compose session
+ * If the session is expired during a post this restores the compose session
* vars.
*/
if (sqsession_is_registered('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.
*/
if (!isset($session) || (isset($newmessage) && $newmessage)) {
sqsession_unregister('composesession');
- $session = "$composesession" +1;
+ $session = "$composesession" +1;
$composesession = $session;
sqsession_register($composesession,'composesession');
-}
+}
if (!isset($compose_messages)) {
$compose_messages = array();
}
$composeMessage->rfc822_header = $rfc822_header;
$composeMessage->reply_rfc822_header = '';
$compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages,'compose_messages');
+ sqsession_register($compose_messages,'compose_messages');
} else {
$composeMessage=$compose_messages[$session];
}
} else {
sqWordWrap($line, $editor_size);
$newBody .= $line . "\n";
-
+
}
-
+
}
$body = $newBody;
-
+
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
} else {
/*
* This handles the default case as well as the error case
- * (they had the same code) --> if (isset($smtpErrors))
+ * (they had the same code) --> if (isset($smtpErrors))
*/
if ($compose_new_win == '1') {
$passed_ent_id = '';
}
if (!isset($passed_id)) {
- $passed_id = '';
+ $passed_id = '';
}
if (!isset($mailbox)) {
$mailbox = '';
- }
+ }
if (!isset($action)) {
$action = '';
}
-
+
$values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session);
/* in case the origin is not read_body.php */
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 */
}
$orig_header = $message->rfc822_header;
}
-
+
$encoding = $message->header->encoding;
$type0 = $message->type0;
$type1 = $message->type1;
$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);
+ $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;
function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) {
global $attachment_dir, $username, $data_dir, $squirrelmail_language;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- if (!count($message->entities) ||
+ if (!count($message->entities) ||
($message->type0 == 'message' && $message->type1 == 'rfc822')) {
if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
switch ($message->type0) {
break;
}
$filename = decodeHeader($filename);
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
$filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
}
}
$message->att_local_name = $full_localfilename;
- $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $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,
return $composeMessage;
}
-function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
+function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$passed_ent_id='', $imapConnection) {
global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
- $body_a = sqimap_run_command($imapConnection,
+ $body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' RFC822',
- TRUE, $response, $readmessage,
+ TRUE, $response, $readmessage,
$uid_support);
} else {
- $body_a = sqimap_run_command($imapConnection,
+ $body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
TRUE, $response, $readmessage, $uid_support);
$message = $message->parent;
if ($response == 'OK') {
$subject = encodeHeader($message->rfc822_header->subject);
array_shift($body_a);
+ array_pop($body_a);
$body = implode('', $body_a) . "\r\n";
-
+
$localfilename = GenerateRandomString(32, 'FILE', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
-
- $fp = fopen( $full_localfilename, 'w');
+
+ $fp = fopen($full_localfilename, 'w');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+ $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
$full_localfilename);
}
return $composeMessage;
$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,
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
$username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
$send_to_bcc = $values['send_to_bcc'];
- $subject = $values['subject'];
+ $subject = $values['subject'];
$mailprio = $values['mailprio'];
$body = $values['body'];
$identity = (int) $values['identity'];
$send_to_cc = decodeHeader($send_to_cc);
$send_to_bcc = decodeHeader($send_to_bcc);
}
-
+
if ($use_javascript_addr_book) {
echo "\n". '<SCRIPT LANGUAGE=JavaScript>'."\n<!--\n" .
'function open_abook() { ' . "\n" .
echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
'ENCTYPE="multipart/form-data"';
do_hook("compose_form");
-
+
echo ">\n";
if ($action == 'draft') {
if (isset($session)) {
echo '<input type="hidden" name="session" value="' . $session . "\">\n";
}
-
+
if (isset($passed_id)) {
echo '<input type="hidden" name="passed_id" value="' . $passed_id . "\">\n";
}
$maxsize .
' </td>' . "\n" .
' </tr>' . "\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) {
+ 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[] = '<table bgcolor="'.$color[0].
'" border="0"><tr><td><input type="checkbox" name="delete[]" value="' .
- $key . "\"></td><td>\n" . $attached_filename .
+ $key . "\"></td><td>\n" . $attached_filename .
'</td><td>-</td><td> ' . $type . '</td><td>('.
show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
}
if (count($s_a)) {
foreach ($s_a as $s) {
echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
- }
+ }
echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
_("Delete selected attachments") . "\">\n" .
'</td></tr>';
}
echo '</TABLE>' . "\n" .
- '<input type="hidden" name="username" value="'. $username . "\">\n" .
+ '<input type="hidden" name="username" value="'. $username . "\">\n" .
'<input type=hidden name=action value="' . $action . "\">\n" .
'<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
"\">\n";
- /*
- store the complete ComposeMessages array in a hidden input value
+ /*
+ 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);
return ($bytesize * (int)substr($ini_size, 0, -1));
}
-
+
return $ini_size;
}
by replacing them back to spaces addressparsing works */
/* FIXME: How to handle in case of other charsets where "\240"
is not a non breaking space ??? */
-
+
$send_to = str_replace("\240",' ',$send_to);
$send_to_cc = str_replace("\240",' ',$send_to_cc);
$send_to_bcc = str_replace("\240",' ',$send_to_bcc);
}
/* Receipt: On Delivery */
if (isset($request_dr) && $request_dr) {
- $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail;
+ $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail;
}
/* multipart messages */
if (count($composeMessage->entities)) {
$mime_header->type1 = 'plain';
if ($special_encoding) {
$mime_header->encoding = $special_encoding;
- } else {
+ } else {
$mime_header->encoding = '8bit';
}
if ($default_charset) {
$mime_header->parameters['charset'] = $default_charset;
}
- $message_body->mime_header = $mime_header;
+ $message_body->mime_header = $mime_header;
array_unshift($composeMessage->entities, $message_body);
$content_type = new ContentType('multipart/mixed');
} else {
$content_type = new ContentType('text/plain');
if ($special_encoding) {
$rfc822_header->encoding = $special_encoding;
- } else {
+ } else {
$rfc822_header->encoding = '8bit';
- }
+ }
if ($default_charset) {
$content_type->properties['charset']=$default_charset;
}
}
-
+
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
- /* Here you can modify the message structure just before we hand
+ /* Here you can modify the message structure just before we hand
it over to deliver */
$hookReturn = do_hook('compose_send', $composeMessage);
/* Get any changes made by plugins to $composeMessage. */
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
$length = $imap_deliver->mail($composeMessage);
- sqimap_append ($imap_stream, $draft_folder, $length);
+ sqimap_append ($imap_stream, $draft_folder, $length);
$imap_deliver->mail($composeMessage, $imap_stream);
sqimap_append_done ($imap_stream, $draft_folder);
sqimap_logout($imap_stream);
$svr_allow_sent = false;
}
- if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
+ if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
&& sqimap_mailbox_exists( $imap_stream, $sent_folder)) {
$fld_sent = true;
} else {
sqimap_mailbox_select ($imap_stream, $mailbox);
sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', true);
}
- sqimap_logout($imap_stream);
+ sqimap_logout($imap_stream);
}
return $succes;
}
projects / squirrelmail.git / commitdiff