<?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$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
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) {
return $result;
}
-/** returns the index of the previous message from the 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($numMessages, $passed_id) {
global $msort, $sort, $msgs,
$thread_sort_messages,
/**
* 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 .
'&mailbox=' . urlencode($mailbox) .
function ServerMDNSupport($read) {
/* escaping $ doesn't work -> \x36 */
- $ret = preg_match('/(\x36MDNSent|\\\*)/i', $read);
+ $ret = preg_match('/(\x36MDNSent|\\\\\*)/i', $read);
return $ret;
}
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);
}
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($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, $nav_on_top = TRUE) {
global $base_uri, $draft_folder, $where, $what, $color, $sort,
- $startMessage, $PHP_SELF, $save_as_draft,
- $enable_forward_as_attachment;
+ $startMessage, $PHP_SELF, $save_as_draft, $uid_support,
+ $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
+ $data_dir, $username, $delete_prev_next_display;
$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>';
- }
$comp_uri = 'src/compose.php' .
- '?passed_id=' . $passed_id .
- '&mailbox=' . $urlMailbox .
- '&startMessage=' . $startMessage .
- (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
+ '?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);
- }
+ $msgs_url = $base_uri . 'src/';
- $s .= '</small></td><td align="center" width="33%"><small>';
+ // 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>';
- 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>';
+ }
}
- $s .= $topbar_delimiter . $next_link;
+
+ $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 ( !(isset($where) && isset($what)) ) {
+ $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
+ $next = findNextMessage($passed_id);
+
+ $prev_link = _("Previous");
+ if ($prev >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $prev_link = '<a href="'.$uri.'">'.$prev_link.'</a>';
+ }
+
+ $next_link = _("Next");
+ if ($next >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $next_link = '<a href="'.$uri.'">'.$next_link.'</a>';
+ }
+
+ // Only bother with Delete & Prev and Delete & Next IF
+ // we have UID support, and top display is enabled.
+ if ( $uid_support && $delete_prev_next_display == 1 ) {
+ $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'.
+ '&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'.
+ '&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.']';
+ }
+
+ // Start with Search Results or Message List link.
+ 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");
}
+ $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>';
+
+ // If Draft folder - create Resume link
+ if (($mailbox == $draft_folder) && ($save_as_draft)) {
+ $comp_alt_uri = $comp_uri . '&smaction=draft';
+ $comp_alt_string = _("Resume Draft");
+ } else if (handleAsSent($mailbox)) {
+ // If in Sent folder, edit as new
+ $comp_alt_uri = $comp_uri . '&smaction=edit_as_new';
+ $comp_alt_string = _("Edit Message as New");
+ }
+
+ // Show Alt URI for Draft/Sent
+ if (isset($comp_alt_uri)) {
+ $menu_row .= makeComposeLink($comp_alt_uri, $comp_alt_string);
+ $menu_row .= $topbar_delimiter . "\n";
+ }
+
+ $comp_action_uri = $comp_uri . '&smaction=reply';
+ $menu_row .= makeComposeLink($comp_action_uri, _("Reply")) . "\n";
+
+ $comp_action_uri = $comp_uri . '&smaction=reply_all';
+ $menu_row .= $topbar_delimiter;
+ $menu_row .= makeComposeLink($comp_action_uri, _("Reply All")) . "\n";
+
- $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"));
+ $menu_row .= $topbar_delimiter;
+ $menu_row .= makeComposeLink($comp_action_uri, _("Forward")) . "\n";
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 .= $topbar_delimiter;
+ $menu_row .= makeComposeLink($comp_action_uri, _("Forward as Attachment")) . "\n";
}
- $comp_action_uri = $comp_uri . '&smaction=reply';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Reply"));
+ $delete_link = _("Delete");
+ if (!(isset($passed_ent_id) && $passed_ent_id)) {
+ $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
+ '&message=' . $passed_id . '&';
- $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;
+ if ($where && $what) {
+ $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
+ } else {
+ $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
+ }
+ $delete_link = '<a href="' . $delete_url . '">' . $delete_link . '</a>';
+ $delete_link .= ' (<a href="' . $delete_url.'&bypass_trash=1">'
+ ._("Bypass Trash").'</a>)';
+
+ }
+ $menu_row .= $topbar_delimiter.$delete_link . "\n";
+
+
+ // Add top move link
+ $menu_row .= '</small></td><td align="right">';
+ if ( !(isset($passed_ent_id) && $passed_ent_id) ) {
+
+ $current_box = 'mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage;
+
+ // Set subsequent location based on whether or not there is a 'next' message.
+ if ( isset($next) && $next >= 0 ) {
+ $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&';
+ } else {
+ $location = $base_uri . 'src/right_main.php?';
+ }
+
+ $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post">'.
+ '<small><input type="hidden" name="show_more" value="0" />'.
+ '<input type="hidden" name="location" value="'.$location.$current_box.'" />'.
+ '<input type="hidden" name="msg[0]" value="'.$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');
}
/* 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" .
$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);
}
/* end of get globals */
-global $uid_support, $sqimap_capabilities;
+global $uid_support, $sqimap_capabilities, $lastTargetMailbox;
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+/**
+ * Process Delete from delete-move-next
+ * but only if delete_id was set
+ */
+if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
+ sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+
+ sqimap_mailbox_expunge_dmn($delete_id);
+}
/**
* $message contains all information about the message
}
}
+formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
+
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
projects / squirrelmail.git / blobdiff