/**
* read_body.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 file is used for reading the msgs array and displaying
* @param int $passed_id
*/
function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
- global $javascript_on, $color;
+ global $javascript_on;
+ /* hackydiehack */
+ if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+ $view_unsafe_images = false;
+ } else {
+ $view_unsafe_images = true;
+ }
$params = '?passed_ent_id=' . urlencode($passed_ent_id) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . urlencode($passed_id);
+ '&passed_id=' . urlencode($passed_id).
+ '&view_unsafe_images='. (bool) $view_unsafe_images;
$print_text = _("View Printable Version");
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
- global $username, $attachment_dir,
- $version, $attachments, $squirrelmail_language, $default_charset,
- $languages, $useSendmail, $domain, $sent_folder,
- $popuser, $data_dir, $username;
+ global $username, $attachment_dir, $popuser, $username, $color,
+ $version, $squirrelmail_language, $default_charset,
+ $languages, $useSendmail, $domain, $sent_folder;
sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER);
$header = $message->rfc822_header;
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rfc822_header = new Rfc822Header();
$content_type = new ContentType('multipart/report');
$special_encoding = '7bit';
}
}
+ } elseif (sq_is8bit($body)) {
+ $special_encoding = '8bit';
}
$part1 = new Message();
$part1->setBody($body);
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp;
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
- global $msn_user_support, $default_use_mdn, $default_use_priority,
+ global $default_use_mdn, $default_use_priority,
$show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
$squirrelmail_language;
global $base_uri, $draft_folder, $where, $what, $color, $sort,
$startMessage, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
- $data_dir, $username, $delete_prev_next_display,
+ $username, $delete_prev_next_display,
$compose_new_win, $javascript_on;
//FIXME cleanup argument list, use $aMailbox where possible
// BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc.
- $menu_row = '<tr bgcolor="'.$color[9].'"><td><small>';
+ $menu_row = '<tr bgcolor="'.$color[0].'"><td><small>';
$comp_uri = $base_uri.'src/compose.php' .
'?passed_id=' . $passed_id .
'&mailbox=' . $urlMailbox .
$target = '';
$on_click='';
$method='method="post" ';
+ $onsubmit='';
if ($compose_new_win == '1') {
if ( $javascript_on ) {
$on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"';
$comp_uri = 'javascript:void(0)';
$method='method="get" ';
+ $onsubmit = 'onsubmit="return false" ';
} else {
$target = 'target="_blank"';
}
}
- $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.' style="display: inline">'."\n";
+ $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '
+ . $method.$target.$onsubmit.' style="display: inline">'."\n";
// If Draft folder - create Resume link
if (($mailbox == $draft_folder) && ($save_as_draft)) {
if (!(isset($passed_ent_id) && $passed_ent_id)) {
$menu_row .= addHidden('mailbox', $aMailbox['NAME']);
$menu_row .= addHidden('msg[0]', $passed_id);
+ $menu_row .= addHidden('startMessage', $startMessage);
$menu_row .= getButton('submit', 'delete', _("Delete"));
$menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
} else {
for ($i = 0; $i < $cnt; $i++) {
$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
if ($i != $cnt-1) {
- $messagebody .= '<hr noshade size="1" />';
+ $messagebody .= '<hr style="height: 1px;" />';
}
}
$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
sqsession_register($mailbox_cache,'mailbox_cache');
?>
-</body></html>
+</body></html>
\ No newline at end of file