/**
* read_body.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/url_parser.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/set_language_align.php');
+/* --------------------- Get globals ------------------------------------- */
+$language_align = set_language_align();
+
/**
* Given an IMAP message id number, this will look it up in the cached
* and sorted msgs array and return the index. Used for finding the next
$result = '';
/* Output the link. */
if ($javascript_on) {
- $result .= '<script language="javascript" type="text/javascript">' . "\n" .
- '<!--' . "\n" .
- " function printFormat() {\n" .
- ' window.open("../src/printer_friendly_main.php' .
- $params . '","Print","width=800,height=600");' . "\n".
- " }\n" .
- "// -->\n" .
- "</script>\n" .
-
"<a href=\"javascript:printFormat();\">$print_text</a>\n";
+ $result = '<script language="javascript" type="text/javascript">' . "\n" .
+ '<!--' . "\n" .
+ " function printFormat() {\n" .
+ ' window.open("../src/printer_friendly_main.php' .
+ $params . '","Print","width=800,height=600");' . "\n".
+ " }\n" .
+ "// -->\n" .
+ "</script>\n" .
+ "<a href=\"javascript:printFormat();\">$print_text</a>\n";
} else {
- $result .= '<A target="_blank" HREF="../src/printer_friendly_bottom.php' .
- "$params\">$print_text</a>\n";
+ $result = '<a target="_blank" href="../src/printer_friendly_bottom.php' .
+ "$params\">$print_text</a>\n";
}
return $result;
}
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
- if ($use_authenticated_smtp) {
+ global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp;
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
+ } else {
global $key, $onetimepad;
$user = $username;
$pass = OneTimePadDecrypt($key, $onetimepad);
- } else {
- $user = '';
- $pass = '';
}
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
$stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $authPop);
+ $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
}
$success = false;
if ($stream) {
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ $msg = $deliver->dlv_msg . '<br>' .
+ _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $deliver->dlv_server_msg;
require_once(SM_PATH . 'functions/display_messages.php');
plain_error_message($msg, $color);
} else {
return $success;
}
-
function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
- global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder,
- $default_use_priority, $show_xmailer_default,
- $mdn_user_support, $PHP_SELF, $javascript_on;
+ global $msn_user_support, $default_use_mdn, $default_use_priority, $language_align,
+ $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
+ $squirrelmail_language;
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ if ($squirrelmail_language == 'ja_JP') {
+ $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ } else {
+ $env[_("Subject")] = decodeHeader(htmlspecialchars($header->subject));
+ }
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
$env[_("Read receipt")] = _("send");
} else {
$env[_("Read receipt")] = _("requested");
- if (!($mailbox == $draft_folder ||
- $mailbox == $sent_folder ||
+ if (!(handleAsSent($mailbox) ||
$message->is_deleted ||
$passed_ent_id)) {
$mdn_url = $PHP_SELF . '&sendreceipt=1';
}
}
- $s = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"';
- $s .= ' ALIGN="center" BGCOLOR="' . $color[0] . '">';
+ $s = '<TABLE dir="' . $language_align['dir'] . '" WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0"';
+ $s .= ' ALIGN="center" BGCOLOR="'.$color[0].'">';
foreach ($env as $key => $val) {
if ($val) {
$s .= '<TR>';
$s .= '</TR>';
}
}
+ echo '<TABLE dir="' . $language_align['dir'] . '" BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
+ ' CELLSPACING="0" BORDER="0" ALIIGN="center">'."\n";
+ echo '<TR dir="' . $language_align['dir'] . '"><TD dir="' . $language_align['dir'] . '" HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+ $color[4].'"></TD></TR><TR><TD dir="' . $language_align['dir'] . '" align=center>'."\n";
echo $s;
- do_hook("read_body_header");
+ do_hook('read_body_header');
formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
echo '</TABLE>';
+ echo '</TD></TR><TR dir="' . $language_align['dir'] . '"><TD dir="' . $language_align['dir'] . '" HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
+ echo '</TABLE>';
}
function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
- global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort,
+ global $base_uri, $draft_folder, $where, $what, $color, $sort, $language_align,
$startMessage, $compose_new_win, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment;
$topbar_delimiter = ' | ';
$urlMailbox = urlencode($mailbox);
- $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
- ' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
+ $s = '<table dir=' . $language_align['dir'] . ' width="100%" cellpadding="3" cellspacing="0" align="center"'.
+ ' border="0" bgcolor="'.$color[9].'"><tr><td align="' . $language_align['left'] . '" width="33%"><small>';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
$msgs_str = _("Message List");
}
$s .= '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
- $s .= $topbar_delimiter;
$delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
'&message=' . $passed_id . '&';
} else {
$delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
}
+ $s .= $topbar_delimiter;
$s .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
}
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$comp_alt_uri = $comp_uri . '&action=draft';
$comp_alt_string = _("Resume Draft");
- } else if ($mailbox == $sent_folder) {
+ } else if (handleAsSent($mailbox)) {
$comp_alt_uri = $comp_uri . '&action=edit_as_new';
$comp_alt_string = _("Edit Message as New");
}
/* code for navigating through attached message/rfc822 messages */
$url = set_url_var($PHP_SELF, 'passed_ent_id',0);
$s .= '<a href="'.$url.'">'._("View Message").'</a>';
+ $entities = array();
+ $entity_count = array();
+ $c = 0;
+
+ foreach($message->parent->entities as $ent) {
+ if ($ent->type0 == 'message' && $ent->type1 == 'rfc822') {
+ $c++;
+ $entity_count[$c] = $ent->entity_id;
+ $entities[$ent->entity_id] = $c;
+ }
+ }
+ $prev_link = _("Previous");
+ $next_link = _("Next");
+ if($entities[$passed_ent_id] > 1) {
+ $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
+ $prev_link = '<a href="'
+ . set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id)
+ . '">' . $prev_link . '</a>';
+ }
+ if($entities[$passed_ent_id] < $c) {
+ $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1];
+ $next_link = '<a href="'
+ . set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
+ . '">' . $next_link . '</a>';
+ }
+ $s .= $topbar_delimiter . $prev_link;
$par_ent_id = $message->parent->entity_id;
if ($par_ent_id) {
$par_ent_id = substr($par_ent_id,0,-2);
$url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
$s .= '<a href="'.$url.'">'._("Up").'</a>';
}
+ $s .= $topbar_delimiter . $next_link;
}
$s .= '</small></td>' . "\n" . '<td align="right" width="33%" nowrap><small>';
$comp_action_uri = $comp_uri . '&action=forward';
$s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
- $s .= $topbar_delimiter;
if ($enable_forward_as_attachment) {
$comp_action_uri = $comp_uri . '&action=forward_as_attachment';
- $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
$s .= $topbar_delimiter;
+ $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
}
$comp_action_uri = decodeHeader($comp_uri . '&action=reply');
- $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
$s .= $topbar_delimiter;
+ $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
$comp_action_uri = $comp_uri . '&action=reply_all';
+ $s .= $topbar_delimiter;
$s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '</a>';
$s .= '</small></td></tr></table>';
do_hook("read_body_menu_top");
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri;
+ global $base_uri, $language_align;
$urlMailbox = urlencode($mailbox);
$url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
- $s = "<TR>\n" .
- '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ": </B></TD>\n" .
- '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>' .
+ $s = "<TR dir=" . $language_align['dir'] . ">\n" .
+ '<TD dir=' . $language_align['dir'] . ' VALIGN="MIDDLE" ALIGN=' . $language_align['right'] . ' WIDTH="20%"><B>' . _("Options") . ": </B></TD>\n" .
+ '<TD dir=' . $language_align['dir'] . ' VALIGN="MIDDLE" ALIGN=' . $language_align['left'] . ' WIDTH="80%"><SMALL>' .
'<a href="'.$url.'">'._("View Full Header").'</a>';
/* Output the printer friendly link if we are in subtle mode. */
/* get the globals we may need */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
$onetimepad = $_SESSION['onetimepad'];
-$msgs = $_SESSION['msgs'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
+$msgs = $_SESSION['msgs'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
if (isset($_GET['passed_id'])) {
- $passed_id = $_GET['passed_id'];
+ $passed_id = (int) $_GET['passed_id'];
}
elseif (isset($_POST['passed_id'])) {
- $passed_id = $_POST['passed_id'];
+ $passed_id = (int) $_POST['passed_id'];
}
if (isset($_GET['passed_ent_id'])) {
}
if (isset($_GET['sort'])) {
- $sort = $_GET['sort'];
+ $sort = (int) $_GET['sort'];
}
elseif (isset($_POST['sort'])) {
- $sort = $_POST['sort'];
+ $sort = (int) $_POST['sort'];
}
if (isset($_GET['startMessage'])) {
- $startMessage = $_GET['startMessage'];
+ $startMessage = (int) $_GET['startMessage'];
}
elseif (isset($_POST['startMessage'])) {
- $startMessage = $_POST['startMessage'];
+ $startMessage = (int) $_POST['startMessage'];
}
if (isset($_GET['show_more'])) {
- $show_more = $_GET['show_more'];
+ $show_more = (int) $_GET['show_more'];
}
if (isset($_GET['show_more_cc'])) {
- $show_more_cc = $_GET['show_more_cc'];
+ $show_more_cc = (int) $_GET['show_more_cc'];
}
if (isset($_GET['show_more_bcc'])) {
- $show_more_bcc = $_GET['show_more_bcc'];
+ $show_more_bcc = (int) $_GET['show_more_bcc'];
}
if (isset($_GET['mailbox'])) {
$mailbox = $_GET['mailbox'];
$what = $_GET['what'];
}
if (isset($_GET['view_hdr'])) {
- $view_hdr = $_GET['view_hdr'];
+ $view_hdr = (int) $_GET['view_hdr'];
}
if (isset($_SESSION['server_sort_array'])) {
$server_sort_array = $_SESSION['server_sort_array'];
}
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
/**
*/
$uidvalidity = $mbx_response['UIDVALIDITY'];
-
+
if (!isset($messages[$uidvalidity])) {
$messages[$uidvalidity] = array();
-}
+}
if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$FirstTimeSee = !$message->is_seen;
/***********************************************/
$msgs[$passed_id]['FLAG_SEEN'] = true;
-
-$messagebody = '';
+
+$messagebody = '';
do_hook('read_body_top');
if ($show_html_default == 1) {
$ent_ar = $message->findDisplayEntity(array());
displayPageHeader($color, $mailbox);
formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
-echo '<table width="100%" cellpadding="0" cellspacing="0" align="center" border="0">';
+echo '<table dir="' . $language_align['dir'] . '" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">';
echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
+echo ' <table dir="' . $language_align['dir'] . '" width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
+echo ' <table dir="' . $language_align['dir'] . '" width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
echo ' <tr bgcolor="'.$color[4].'"><td>';
-echo ' <table cellpadding="5" cellspacing="0" border="0">';
-echo ' <tr>'. html_tag( 'td', '<br>'. $messagebody."\n", 'left').'</td>';
+echo ' <table dir="' . $language_align['dir'] . '" cellpadding="1" cellspacing="5" align="' . $language_align['left'] . '" border="0">';
+echo ' <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
+ . '</tr>';
echo ' </table>';
echo ' </td></tr>';
echo ' </table></td></tr>';
echo ' </table>';
echo ' </td></tr>';
+echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+ $color[4].'"></TD></TR>'."\n";
+
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
+ echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
+ echo ' <tr><td align="' . $language_align['left'] . '" bgcolor="'.$color[9].'">';
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'"><tr><td>';
echo $attachmentsdisplay;
echo ' </td></tr></table>';
- echo ' </table></td></tr>';
- echo ' </table></td></tr>';
- echo ' </table>';
+ echo ' </td></tr></table>';
+ echo ' </td></tr></table>';
echo ' </td></tr>';
+ echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+ $color[4].'"></TD></TR>';
}
echo '</table>';
projects / squirrelmail.git / blobdiff