<?php
-
/**
* read_body.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
* the resulting emails in the right frame.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
/**
* 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
- * and previous messages.
+ * and sorted msgs array and return the index of the next message
*
+ * @param int $passed_id The current message UID
* @return the index of the next valid message from the array
*/
-function findNextMessage($passed_id) {
- global $msort, $msgs, $sort,
- $thread_sort_messages, $allow_server_sort,
- $server_sort_array;
- if (!is_array($server_sort_array)) {
- $thread_sort_messages = 0;
- $allow_server_sort = FALSE;
+function findNextMessage($uidset,$passed_id='backwards') {
+ if (!is_array($uidset)) {
+ return -1;
+ }
+ if ($passed_id=='backwards' || !is_array($uidset)) { // check for backwards compattibilty gpg plugin
+ $passed_id = $uidset;
}
$result = -1;
- if ($thread_sort_messages || $allow_server_sort) {
- $count = count($server_sort_array) - 1;
- foreach($server_sort_array as $key=>$value) {
- if ($passed_id == $value) {
- if ($key == $count) {
- break;
- }
- $result = $server_sort_array[$key + 1];
- break;
- }
- }
- } else {
- if (is_array($msort)) {
- for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($passed_id == $msgs[$key]['ID']) {
- next($msort);
- $key = key($msort);
- if (isset($key)){
- $result = $msgs[$key]['ID'];
- break;
- }
- }
+ $count = count($uidset) - 1;
+ foreach($uidset as $key=>$value) {
+ if ($passed_id == $value) {
+ if ($key == $count) {
+ break;
}
+ $result = $uidset[$key + 1];
+ break;
}
}
return $result;
}
-/** returns the index of the previous message from the array. */
-function findPreviousMessage($numMessages, $passed_id) {
- global $msort, $sort, $msgs,
- $thread_sort_messages,
- $allow_server_sort, $server_sort_array;
+/**
+ * Given an IMAP message id number, this will look it up in the cached
+ * and sorted msgs array and return the index of the previous message
+ *
+ * @param int $passed_id The current message UID
+ * @return the index of the next valid message from the array
+ */
+
+function findPreviousMessage($uidset, $passed_id) {
+ if (!is_array($uidset)) {
+ return -1;
+ }
$result = -1;
- if (!is_array($server_sort_array)) {
- $thread_sort_messages = 0;
- $allow_server_sort = FALSE;
- }
- if ($thread_sort_messages || $allow_server_sort ) {
- foreach($server_sort_array as $key=>$value) {
- if ($passed_id == $value) {
- if ($key == 0) {
- break;
- }
- $result = $server_sort_array[$key - 1];
- break;
- }
- }
- } else {
- if (is_array($msort)) {
- for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($passed_id == $msgs[$key]['ID']) {
- prev($msort);
- $key = key($msort);
- if (isset($key)) {
- $result = $msgs[$key]['ID'];
- break;
- }
- }
+ foreach($uidset as $key=>$value) {
+ if ($passed_id == $value) {
+ if ($key != 0) {
+ $result = $uidset[$key - 1];
}
+ break;
}
}
+
return $result;
}
/**
* Displays a link to a page where the message is displayed more
* "printer friendly".
+ * @param string $mailbox Name of current mailbox
+ * @param int $passed_id
*/
-function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
- global $javascript_on;
+function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
+ global $javascript_on, $color;
- $params = '?passed_ent_id=' . $passed_ent_id .
+ $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id;
+ '&passed_id=' . urlencode($passed_id);
$print_text = _("View Printable Version");
return $result;
}
-function ServerMDNSupport($read) {
- /* escaping $ doesn't work -> \x36 */
- $ret = preg_match('/(\x36MDNSent|\\\*)/i', $read);
- return $ret;
+function ServerMDNSupport($aFlags) {
+ /* escaping $ doesn't work -> \x36 */
+ return ( in_array('$mdnsent',$aFlags,true) ||
+ in_array('\\*',$aFlags,true) ) ;
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
- global $username, $attachment_dir,
+ global $username, $attachment_dir,
$version, $attachments, $squirrelmail_language, $default_charset,
$languages, $useSendmail, $domain, $sent_folder,
$popuser, $data_dir, $username;
$rfc822_header->to[] = $header->dnt;
$rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject);
+ // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md)
+ // This merely comes from compose.php and only happens when there is no
+ // email_addr specified in user's identity (which is the startup config)
+ if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
+ $popuser = $usernamedata[1];
+ $domain = $usernamedata[2];
+ unset($usernamedata);
+ } else {
+ $popuser = $username;
+ }
$reply_to = '';
$ident = get_identities();
$from_addr = '"'.$full_name.'" <'.$from_mail.'>';
$reply_to = $ident[$identity]['reply_to'];
- if (!$from_addr) {
- $from_addr = "$popuser@$domain";
- $from_mail = $from_addr;
+ if (!$from_mail) {
+ $from_mail = "$popuser@$domain";
+ $from_addr = $from_mail;
}
$rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
if ($reply_to) {
$now = getLongDateString( time() );
set_my_charset();
$body = _("Your message") . "\r\n\r\n" .
- "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" .
- "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" .
- "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
+ "\t" . _("To") . ': ' . decodeHeader($to,false,false) . "\r\n" .
+ "\t" . _("Subject") . ': ' . decodeHeader($header->subject,false,false) . "\r\n" .
+ "\t" . _("Sent") . ': ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
$special_encoding = '';
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
- $body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body);
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) {
+ $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $body);
if (strtolower($default_charset) == 'iso-2022-jp') {
if (mb_detect_encoding($body) == 'ASCII') {
$special_encoding = '8bit';
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_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);
- }
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
$smtpServerAddress, $smtpPort, $user, $pass, $authPop);
}
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br>' .
+ $msg = $deliver->dlv_msg . '<br />' .
_("Server replied: ") . $deliver->dlv_ret_nr . ' '.
$deliver->dlv_server_msg;
require_once(SM_PATH . 'functions/display_messages.php');
return $success;
}
-function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
+function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) {
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
- $read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage, $uid_support);
+ $read = sqimap_run_command ($imapConnection, $cmd, true, $response,
+ $readmessage, TRUE);
}
function ClearAttachments() {
$rem_attachments = array();
if (isset($attachments)) {
- foreach ($attachments as $info) {
- if ($info['session'] == -1) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- } else {
- $rem_attachments[] = $info;
- }
- }
+ foreach ($attachments as $info) {
+ if ($info['session'] == -1) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+ } else {
+ $rem_attachments[] = $info;
+ }
+ }
}
$attachments = $rem_attachments;
}
foreach($recipients as $r) {
$add = decodeHeader($r->getAddress(true));
if ($string) {
- $string .= '<BR>' . $add;
+ $string .= '<br />' . $add;
} else {
$string = $add;
if ($cnt > 1) {
- $string .= ' (<A HREF="'.$url;
+ $string .= ' (<a href="'.$url;
if ($show) {
- $string .= '">'._("less").'</A>)';
+ $string .= '">'._("less").'</a>)';
} else {
- $string .= '">'._("more").'</A>)';
+ $string .= '">'._("more").'</a>)';
break;
}
}
return $string;
}
-function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
+function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
global $msn_user_support, $default_use_mdn, $default_use_priority,
$show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
$squirrelmail_language;
+ $mailbox = $aMailbox['NAME'] ;
+
$header = $message->rfc822_header;
$env = array();
$env[_("Subject")] = str_replace(" "," ",decodeHeader($header->subject));
if ($message->is_mdnsent) {
$env[_("Read receipt")] = _("sent");
} else {
- $env[_("Read receipt")] = _("requested");
- if (!(handleAsSent($mailbox) ||
+ $env[_("Read receipt")] = _("requested");
+ if (!(handleAsSent($mailbox) ||
$message->is_deleted ||
$passed_ent_id)) {
$mdn_url = $PHP_SELF . '&sendreceipt=1';
}
}
- $s = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0"';
- $s .= ' ALIGN="center" BGCOLOR="'.$color[0].'">';
+ $s = '<table width="100%" cellpadding="0" cellspacing="2" border="0"';
+ $s .= ' align="center" bgcolor="'.$color[0].'">';
foreach ($env as $key => $val) {
if ($val) {
- $s .= '<TR>';
- $s .= html_tag('TD', '<B>' . $key . ': </B>', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
- $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
- $s .= '</TR>';
+ $s .= '<tr>';
+ $s .= html_tag('td', '<b>' . $key . ': </b>', 'right', '', 'valign="top" width="20%"') . "\n";
+ $s .= html_tag('td', $val, 'left', '', 'valign="top" width="80%"') . "\n";
+ $s .= '</tr>';
}
}
- echo '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
- ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n";
- echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR><TR><TD align=center>'."\n";
+ echo '<table bgcolor="'.$color[9].'" width="100%" cellpadding="1"'.
+ ' cellspacing="0" border="0" align="center">'."\n";
+ echo '<tr><td height="5" colspan="2" bgcolor="'.
+ $color[4].'"></td></tr><tr><td align="center">'."\n";
echo $s;
do_hook('read_body_header');
formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
- echo '</TABLE>';
- echo '</TD></TR><TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
- echo '</TABLE>';
+ echo '</table>';
+ echo '</td></tr><tr><td height="5" colspan="2" bgcolor="'.$color[4].'"></td></tr>'."\n";
+ echo '</table>';
}
-function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
+/**
+ * Format message toolbar
+ *
+ * @param string $mailbox Name of current mailbox
+ * @param int $passed_id UID of current message
+ * @param int $passed_ent_id Id of entity within message
+ * @param object $message Current message object
+ * @param object $mbx_response
+ */
+function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removedVar, $nav_on_top = TRUE) {
global $base_uri, $draft_folder, $where, $what, $color, $sort,
$startMessage, $PHP_SELF, $save_as_draft,
- $enable_forward_as_attachment;
+ $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
+ $data_dir, $username, $delete_prev_next_display,
+ $compose_new_win, $javascript_on;
+
+ //FIXME cleanup argument list, use $aMailbox where possible
+ $mailbox = $aMailbox['NAME'];
$topbar_delimiter = ' | ';
+ $double_delimiter = ' ';
$urlMailbox = urlencode($mailbox);
- $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
- ' border="0" bgcolor="'.$color[9].'"><tr>' .
- html_tag( 'td', '', 'left', '', 'width="33%"' ) . '<small>';
$msgs_url = $base_uri . 'src/';
- if (isset($where) && isset($what)) {
- $msgs_url .= 'search.php?where=' . urlencode($where) .
- '&what=' . urlencode($what) . '&mailbox=' . $urlMailbox;
- $msgs_str = _("Search results");
- } else {
- $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' .
- $startMessage . '&mailbox=' . $urlMailbox;
- $msgs_str = _("Message List");
- }
- $s .= '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
- $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
- '&message=' . $passed_id . '&';
- if (!(isset($passed_ent_id) && $passed_ent_id)) {
- if ($where && $what) {
- $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
- } else {
- $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
- }
- $s .= $topbar_delimiter;
- $s .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
- }
+ // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc.
+ $nav_row = '<tr><td align="left" colspan="2" style="border: 1px solid '.$color[9].';"><small>';
- $comp_uri = 'src/compose.php' .
- '?passed_id=' . $passed_id .
- '&mailbox=' . $urlMailbox .
- '&startMessage=' . $startMessage .
- (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
-
- if (($mailbox == $draft_folder) && ($save_as_draft)) {
- $comp_alt_uri = $comp_uri . '&smaction=draft';
- $comp_alt_string = _("Resume Draft");
- } else if (handleAsSent($mailbox)) {
- $comp_alt_uri = $comp_uri . '&smaction=edit_as_new';
- $comp_alt_string = _("Edit Message as New");
- }
- if (isset($comp_alt_uri)) {
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_alt_uri, $comp_alt_string);
- }
-
- $s .= '</small></td><td align="center" width="33%"><small>';
-
- if (!(isset($where) && isset($what)) && !$passed_ent_id) {
- $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
- $next = findNextMessage($passed_id);
- if ($prev != -1) {
- $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
- '&mailbox='.$urlMailbox.'&sort='.$sort.
- '&startMessage='.$startMessage.'&show_more=0';
- $s .= '<a href="'.$uri.'">'._("Previous").'</a>';
- } else {
- $s .= _("Previous");
- }
- $s .= $topbar_delimiter;
- if ($next != -1) {
- $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
- '&mailbox='.$urlMailbox.'&sort='.$sort.
- '&startMessage='.$startMessage.'&show_more=0';
- $s .= '<a href="'.$uri.'">'._("Next").'</a>';
- } else {
- $s .= _("Next");
- }
- } else if (isset($passed_ent_id) && $passed_ent_id) {
- /* code for navigating through attached message/rfc822 messages */
+ // Create Prev & Next links
+ // Handle nested entities first (i.e. Mime Attach parts)
+ if (isset($passed_ent_id) && $passed_ent_id) {
+ // 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;
$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>';
}
+
+ $next_link = _("Next");
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;
+ $up_link = '';
if ($par_ent_id) {
$par_ent_id = substr($par_ent_id,0,-2);
- $s .= $topbar_delimiter;
- $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
- $s .= '<a href="'.$url.'">'._("Up").'</a>';
+ if ( $par_ent_id != 0 ) {
+ $up_link = $topbar_delimiter;
+ $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
+ $up_link .= '<a href="'.$url.'">'._("Up").'</a>';
+ }
+ }
+
+ $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link;
+ $nav_row .= $double_delimiter . '[<a href="'.$url.'">'._("View Message").'</a>]';
+
+ // Prev/Next links for regular messages
+ } else if ( true ) { //!(isset($where) && isset($what)) ) {
+ /**
+ * Check if cache is still valid
+ */
+ if (!is_array($aMailbox['UIDSET'][$what])) {
+ fetchMessageHeaders($imapConnection, $aMailbox);
+ }
+ $prev = findPreviousMessage($aMailbox['UIDSET'][$what], $passed_id);
+ $next = findNextMessage($aMailbox['UIDSET'][$what],$passed_id);
+
+ $prev_link = _("Previous");
+ if ($prev >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ "&where=$where&what=$what" .
+ '&startMessage='.$startMessage.'&show_more=0';
+ $prev_link = '<a href="'.$uri.'">'.$prev_link.'</a>';
}
- $s .= $topbar_delimiter . $next_link;
+
+ $next_link = _("Next");
+ if ($next >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ "&where=$where&what=$what" .
+ '&startMessage='.$startMessage.'&show_more=0';
+ $next_link = '<a href="'.$uri.'">'.$next_link.'</a>';
+ }
+
+ // Only bother with Delete & Prev and Delete & Next IF
+ // top display is enabled.
+ if ( $delete_prev_next_display == 1 &&
+ in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
+ $del_prev_link = _("Delete & Prev");
+ if ($prev >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0'.
+ "&where=$where&what=$what" .
+ '&delete_id='.$passed_id;
+ $del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
+ }
+
+ $del_next_link = _("Delete & Next");
+ if ($next >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0'.
+ "&where=$where&what=$what" .
+ '&delete_id='.$passed_id;
+ $del_next_link = '<a href="'.$uri.'">'.$del_next_link.'</a>';
+ }
+ }
+
+ $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']';
+ if ( isset($del_prev_link) && isset($del_next_link) )
+ $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']';
}
- $s .= '</small></td>' . "\n" .
- html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
- $comp_action_uri = $comp_uri . '&smaction=forward';
- $s .= makeComposeLink($comp_action_uri, _("Forward"));
+ // Start with Search Results or Message List link.
+ $msgs_url .= "$where?where=read_body.php&what=$what&mailbox=" . $urlMailbox.
+ "&startMessage=$startMessage";
+ if ($where == 'search.php') {
+ $msgs_str = _("Search Results");
+ } else {
+ $msgs_str = _("Message List");
+ }
+ $nav_row .= $double_delimiter .
+ '[<a href="' . $msgs_url . '">' . $msgs_str . '</a>]';
+
+ $nav_row .= '</small></td></tr>';
+
+
+ // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc.
+ $menu_row = '<tr bgcolor="'.$color[9].'"><td><small>';
+ $comp_uri = $base_uri.'src/compose.php' .
+ '?passed_id=' . $passed_id .
+ '&mailbox=' . $urlMailbox .
+ '&startMessage=' . $startMessage .
+ (isset($passed_ent_id) ? '&passed_ent_id='.$passed_ent_id : '');
+
+ // Start form for reply/reply all/forward..
+ $target = '';
+ $on_click='';
+ $method='method="post" ';
+ 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" ';
+ } else {
+ $target = 'target="_blank"';
+ }
+ }
+
+ $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.' style="display: inline">'."\n";
+
+ // If Draft folder - create Resume link
+ if (($mailbox == $draft_folder) && ($save_as_draft)) {
+ $new_button = 'smaction_draft';
+ $comp_alt_string = _("Resume Draft");
+ } else if (handleAsSent($mailbox)) {
+ // If in Sent folder, edit as new
+ $new_button = 'smaction_edit_new';
+ $comp_alt_string = _("Edit Message as New");
+ }
+ // Show Alt URI for Draft/Sent
+ if (isset($comp_alt_string))
+ $menu_row .= getButton('submit', $new_button, $comp_alt_string, $on_click) . "\n";
+
+ $menu_row .= getButton('submit', 'smaction_reply', _("Reply"), $on_click) . "\n";
+ $menu_row .= getButton('submit', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
+ $menu_row .= getButton('submit', 'smaction_forward', _("Forward"), $on_click);
+ if ($enable_forward_as_attachment)
+ $menu_row .= '<input type="checkbox" name="smaction_attache" />' . _("As Attachment") .' '."\n";
+
+ $menu_row .= '</form> ';
+
+ if ( in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
+ // Form for deletion. Form is handled by the originating display in $where. This is right_main.php or search.php
+ $delete_url = $base_uri . "src/$where";
+ $menu_row .= '<form name="deleteMessageForm" action="'.$delete_url.'" method="post" style="display: inline">';
+
+ if (!(isset($passed_ent_id) && $passed_ent_id)) {
+ $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
+ $menu_row .= addHidden('msg[0]', $passed_id);
+ $menu_row .= getButton('submit', 'delete', _("Delete"));
+ $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
+ } else {
+ $menu_row .= getButton('submit', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
+ }
- if ($enable_forward_as_attachment) {
- $comp_action_uri = $comp_uri . '&smaction=forward_as_attachment';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
+ $menu_row .= '</form>';
}
- $comp_action_uri = $comp_uri . '&smaction=reply';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Reply"));
+ // Add top move link
+ $menu_row .= '</small></td><td align="right">';
+ if ( !(isset($passed_ent_id) && $passed_ent_id) &&
+ in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
- $comp_action_uri = $comp_uri . '&smaction=reply_all';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Reply All"));
- $s .= '</small></td></tr></table>';
- do_hook('read_body_menu_top');
- echo $s;
+ $menu_row .= '<form name="moveMessageForm" action="'.$base_uri.'src/'.$where.'?'.'" method="post" style="display: inline">'.
+ '<small>'.
+
+ addHidden('mailbox',$aMailbox['NAME']) .
+ addHidden('msg[0]', $passed_id) . _("Move to:") .
+ '<select name="targetMailbox" style="padding: 0px; margin: 0px">';
+
+ if (isset($lastTargetMailbox) && !empty($lastTargetMailbox)) {
+ $menu_row .= sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)));
+ } else {
+ $menu_row .= sqimap_mailbox_option_list($imapConnection);
+ }
+ $menu_row .= '</select> ';
+
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '</form>';
+ }
+ $menu_row .= '</td></tr>';
+
+ // echo rows, with hooks
+ $ret = do_hook_function('read_body_menu_top', array($nav_row, $menu_row));
+ if (is_array($ret)) {
+ if (isset($ret[0]) && !empty($ret[0])) {
+ $nav_row = $ret[0];
+ }
+ if (isset($ret[1]) && !empty($ret[1])) {
+ $menu_row = $ret[1];
+ }
+ }
+ echo '<table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
+ echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row;
+ echo '</table>'."\n";
do_hook('read_body_menu_bottom');
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri;
+ global $base_uri, $where, $what;
$urlMailbox = urlencode($mailbox);
- sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER);
+ $urlPassed_id = urlencode($passed_id);
+ $urlPassed_ent_id = urlencode($passed_ent_id);
+
+ $query_string = 'mailbox=' . $urlMailbox . '&passed_id=' . $urlPassed_id . '&passed_ent_id=' . $urlPassed_ent_id;
+
+ if (!empty($where)) {
+ $query_string .= '&where=' . urlencode($where);
+ }
+
+ if (!empty($what)) {
+ $query_string .= '&what=' . urlencode($what);
+ }
+
$url = $base_uri.'src/view_header.php?'.$query_string;
- $s = "<TR>\n" .
- html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ": </B></TD>\n" .
- html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '<SMALL>' .
+ $s = "<tr>\n" .
+ html_tag( 'td', '', 'right', '', 'valign="middle" width="20%"' ) . '<b>' . _("Options") . ": </b></td>\n" .
+ html_tag( 'td', '', 'left', '', 'valign="middle" width="80%"' ) . '<small>' .
'<a href="'.$url.'">'._("View Full Header").'</a>';
/* Output the printer friendly link if we are in subtle mode. */
$s .= ' | ' .
- printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
+ printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
do_hook("read_body_header_right");
- $s = "</SMALL></TD>\n" .
- "</TR>\n";
+ $s = "</small></td>\n" .
+ "</tr>\n";
echo $s;
}
sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
-
-sqgetGlobalVar('msgs', $msgs, SQ_SESSION);
-sqgetGlobalVar('msort', $msort, SQ_SESSION);
sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
-sqgetGlobalVar('server_sort_array', $server_sort_array, SQ_SESSION);
if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) {
$messages = array();
}
/** GET VARS */
sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET);
-sqgetGlobalVar('where', $where, SQ_GET);
-sqgetGlobalVar('what', $what, SQ_GET);
+if (!sqgetGlobalVar('where', $where, SQ_GET) ) {
+ $where = 'right_main.php';
+}
+if (!sqgetGlobalVar('what', $what, SQ_GET) ){
+ $what = 0;
+}
if ( sqgetGlobalVar('show_more', $temp, SQ_GET) ) {
$show_more = (int) $temp;
}
$view_hdr = (int) $temp;
}
-/** POST VARS */
-sqgetGlobalVar('move_id', $move_id, SQ_POST);
-
/** GET/POST VARS */
sqgetGlobalVar('passed_ent_id', $passed_ent_id);
sqgetGlobalVar('mailbox', $mailbox);
}
if ( sqgetGlobalVar('startMessage', $temp) ) {
$startMessage = (int) $temp;
+} else {
+ $startMessage = 1;
}
+/**
+ * Retrieve mailbox cache
+ */
+sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
/* end of get globals */
-global $uid_support, $sqimap_capabilities;
+global $sqimap_capabilities, $lastTargetMailbox;
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array('setindex' => $what),array());
+/**
+ * Update the seen state
+ * and ignore in_array('\\seen',$aMailbox['PERMANENTFLAGS'],true)
+ */
+if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) {
+ $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\seen'] = true;
+}
+
+/**
+ * Process Delete from delete-move-next
+ * but only if delete_id was set
+ */
+if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
+ handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id));
+// sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+// sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id);
+}
/**
* $message contains all information about the message
* including header and body
*/
-$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;
- $message->is_seen = true;
- $messages[$uidvalidity][$passed_id] = $message;
+if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'])) {
+ $message = $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'];
+ $FirstTimeSee = !$message->is_seen;
} else {
-// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
- $message = $messages[$uidvalidity][$passed_id];
- $FirstTimeSee = !$message->is_seen;
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $FirstTimeSee = !$message->is_seen;
+ $message->is_seen = true;
+ $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
}
if (isset($passed_ent_id) && $passed_ent_id) {
- $message = $message->getEntity($passed_ent_id);
- if ($message->type0 != 'message' && $message->type1 != 'rfc822') {
- $message = $message->parent;
- }
- $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support);
- $rfc822_header = new Rfc822Header();
- $rfc822_header->parseHeader($read);
- $message->rfc822_header = $rfc822_header;
+ $message = $message->getEntity($passed_ent_id);
+ if ($message->type0 != 'message' && $message->type1 != 'rfc822') {
+ $message = $message->parent;
+ }
+ $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, TRUE);
+ $rfc822_header = new Rfc822Header();
+ $rfc822_header->parseHeader($read);
+ $message->rfc822_header = $rfc822_header;
} else {
- $passed_ent_id = 0;
+ $passed_ent_id = 0;
}
$header = $message->header;
-do_hook('html_top');
/****************************************/
/* Block for handling incoming url vars */
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
- if (isset($identity) ) {
- $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' );
- } else {
- $final_recipient = getPref($data_dir, $username, 'email_address', '' );
- }
-
- $final_recipient = trim($final_recipient);
- if ($final_recipient == '' ) {
- $final_recipient = getPref($data_dir, $username, 'email_address', '' );
- }
- $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
+ $final_recipient = '';
+ if ((isset($identity)) && ($identity != 0)) //Main identity
+ $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' ));
+ if ($final_recipient == '' )
+ $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' ));
+ $supportMDN = ServerMDNSupport($aMailbox["PERMANENTFLAGS"]);
if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) {
- ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id, $uid_support);
+ ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id);
$message->is_mdnsent = true;
- $messages[$uidvalidity][$passed_id]=$message;
+ $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
}
ClearAttachments();
}
/* End of block for handling incoming url vars */
/***********************************************/
-$msgs[$passed_id]['FLAG_SEEN'] = true;
+
$messagebody = '';
do_hook('read_body_top');
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 noshade size="1" />';
}
}
displayPageHeader($color, $mailbox);
-formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
-formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
+formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message,false);
+formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
echo '<table 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 ' <tr bgcolor="'.$color[4].'"><td>';
// echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
-echo ' <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
+echo ' <tr>' . html_tag( 'td', '<br />'. $messagebody."\n", 'left')
. '</tr>';
echo ' </table>';
-echo ' </td></tr>';
+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";
+echo '<tr><td height="5" colspan="2" bgcolor="'.
+ $color[4].'"></td></tr>'."\n";
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
+ echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo ' <tr><td>';
echo ' </td></tr></table>';
echo ' </td></tr></table>';
echo ' </td></tr>';
- echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR>';
+ echo '<tr><td height="5" colspan="2" bgcolor="'.
+ $color[4].'"></td></tr>';
}
echo '</table>';
echo html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', '<img src="' . $imgurl . '">' ."\n", 'left'
+ html_tag( 'td', '<img src="' . $imgurl . '" />' ."\n", 'left'
)
) ,
- 'center', '', 'cellspacing=0 border="0" cellpadding="2"');
+ 'center', '', 'cellspacing="0" border="0" cellpadding="2"');
}
}
+formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE);
+
do_hook('read_body_bottom');
-do_hook('html_bottom');
sqimap_logout($imapConnection);
-/* sessions are written at the end of the script. it's better to register
+/* sessions are written at the end of the script. it's better to register
them at the end so we avoid double session_register calls */
-sqsession_register($messages,'messages');
-
+/* add the mailbox to the cache */
+$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+sqsession_register($mailbox_cache,'mailbox_cache');
?>
</body>
</html>
projects / squirrelmail.git / blobdiff