X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=0f3b214435d44059221170fc5a932cffd562a688;hp=a4588362c4a0b64eb3ebaeb0c7e3b11b82054287;hb=1a531551726e16fe9ccbd8de06731c1730d8fce2;hpb=1c13663ffabc6999b47b77758f8f8562d50396ef diff --git a/src/read_body.php b/src/read_body.php index a4588362..0f3b2144 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -315,11 +315,11 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { 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); + $readmessage, TRUE); } function ClearAttachments() { @@ -487,20 +487,15 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, */ 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, $uid_support, + $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, - $data_dir, $username, $delete_prev_next_display; + $data_dir, $username, $delete_prev_next_display, + $compose_new_win, $javascript_on; $topbar_delimiter = ' | '; $double_delimiter = '    '; $urlMailbox = urlencode($mailbox); - $comp_uri = 'src/compose.php' . - '?passed_id=' . $passed_id . - '&mailbox=' . $urlMailbox . - '&startMessage=' . $startMessage . - (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:''); - $msgs_url = $base_uri . 'src/'; // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc. @@ -575,8 +570,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp } // 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 ) { + // top display is enabled. + if ( $delete_prev_next_display == 1 ) { $del_prev_link = _("Delete & Prev"); if ($prev >= 0) { $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. @@ -619,57 +614,70 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc. $menu_row = ''; + $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="get" '; + 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)'; + } else { + $target = 'target="_blank"'; + $method='method="post" '; + } + } + + $menu_row .= "\n".'
'."\n"; // If Draft folder - create Resume link if (($mailbox == $draft_folder) && ($save_as_draft)) { - $comp_alt_uri = $comp_uri . '&smaction=draft'; + $new_button = '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'; + $new_button = 'smaction_edit_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"; - } + if (isset($comp_alt_string)) + $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n"; - $comp_action_uri = $comp_uri . '&smaction=reply'; - $menu_row .= makeComposeLink($comp_action_uri, _("Reply")) . "\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 .= '' . _("Attachment") ."\n"; - $comp_action_uri = $comp_uri . '&smaction=reply_all'; - $menu_row .= $topbar_delimiter; - $menu_row .= makeComposeLink($comp_action_uri, _("Reply All")) . "\n"; + $menu_row .= ''.'  '."\n"; + // Form for deletion + $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox; + $menu_row .= '
'; - $comp_action_uri = $comp_uri . '&smaction=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'; - $menu_row .= $topbar_delimiter; - $menu_row .= makeComposeLink($comp_action_uri, _("Forward as Attachment")) . "\n"; - } - - $delete_link = _("Delete"); if (!(isset($passed_ent_id) && $passed_ent_id)) { - $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox . - '&message=' . $passed_id . '&'; + $menu_row .= ''; if ($where && $what) { - $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what); + $menu_row .= ''; + $menu_row .= ''; } else { - $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage; + $menu_row .= ''; + $menu_row .= ''; } - $delete_link = '' . $delete_link . ''; - $delete_link .= ' (' - ._("Bypass Trash").')'; - + $menu_row .= getButton('SUBMIT', 'delete', _("Delete")); + $menu_row .= '' . _("Bypass Trash"); } - $menu_row .= $topbar_delimiter.$delete_link . "\n"; + else + $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled + + $menu_row .= '' . "\n"; // Add top move link @@ -793,7 +801,7 @@ if ( sqgetGlobalVar('startMessage', $temp) ) { } /* end of get globals */ -global $uid_support, $sqimap_capabilities, $lastTargetMailbox; +global $sqimap_capabilities, $lastTargetMailbox; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); @@ -818,7 +826,7 @@ $uidvalidity = $mbx_response['UIDVALIDITY']; if (!isset($messages[$uidvalidity])) { $messages[$uidvalidity] = array(); } -if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) { +if (!isset($messages[$uidvalidity][$passed_id])) { $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); $FirstTimeSee = !$message->is_seen; $message->is_seen = true; @@ -834,7 +842,7 @@ if (isset($passed_ent_id) && $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); + $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; @@ -858,7 +866,7 @@ if (isset($sendreceipt)) { $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' )); $supportMDN = ServerMDNSupport($mbx_response["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; }