if ($thread_sort_messages || $allow_server_sort ) {
foreach($server_sort_array as $key=>$value) {
if ($passed_id == $value) {
- if ($key == 0) {
- break;
+ if ($key != 0) {
+ $result = $server_sort_array[$key - 1];
}
- $result = $server_sort_array[$key - 1];
break;
}
}
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() {
*/
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.
}
// 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.
// 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)) {
- $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";
- }
-
- $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";
+ 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";
- $comp_action_uri = $comp_uri . '&smaction=forward';
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_action_uri, _("Forward")) . "\n";
+ $menu_row .= '</form> ';
- 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";
- }
+ // Form for deletion
+ $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
+ $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline">';
- $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 .= '<input type="hidden" name="message" value="'.$passed_id.'" />';
if ($where && $what) {
- $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
+ $menu_row .= '<input type="hidden" name="where" value="'.$where.'" />';
+ $menu_row .= '<input type="hidden" name="what" value="'.$what.'" />';
} else {
- $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
+ $menu_row .= '<input type="hidden" name="sort" value="'.$sort.'" />';
+ $menu_row .= '<input type="hidden" name="startMessage" value="'.$startMessage.'" />';
}
- $delete_link = '<a href="' . $delete_url . '">' . $delete_link . '</a>';
- $delete_link .= ' (<a href="' . $delete_url.'&bypass_trash=1">'
- ._("Bypass Trash").'</a>)';
-
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
+ $menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
}
- $menu_row .= $topbar_delimiter.$delete_link . "\n";
+ else
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
+
+ $menu_row .= '</form>';
// Add top move link
$menu_row .= '</small></td><td align="right">';
if ( !(isset($passed_ent_id) && $passed_ent_id) ) {
- // If we have a next message, move, and then go to next.
- // Otherwise, use move_messages to move, and then return to index.
$current_box = 'mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage;
- $action = $base_uri;
+
+ // Set subsequent location based on whether or not there is a 'next' message.
if ( isset($next) && $next >= 0 ) {
- $action .= 'src/read_body.php?passed_id='.$next.'&';
+ $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&';
+ } elseif (isset($prev) && $prev >= 0) {
+ $location = $base_uri . 'src/read_body.php?passed_id='.$prev.'&';
} else {
- $action .= 'src/move_messages.php?';
+ $location = $base_uri . 'src/right_main.php?';
}
- $action .= $current_box;
- $menu_row .= '<form action="'.$action.'" method="post">'.
+ $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post" style="display: inline">'.
'<small><input type="hidden" name="show_more" value="0" />'.
+ '<input type="hidden" name="dmn" value="1" />'.
+ '<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">';
}
$menu_row .= '</select> ';
- // If we'll be using move_messages.php, also add location to form
- if ( !isset($next) || $next < 0 ) {
- $menu_row .= '<input type="hidden" name="location" value="'.$base_uri.'src/right_main.php?'.$current_box.'" />';
- }
-
$menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
}
$menu_row .= '</td></tr>';
}
/* 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);
sqimap_mailbox_expunge_dmn($delete_id);
}
-/**
- * Process Move from delete-move-next
- * but only if move_id and target_mailbox were set
- */
-if ( sqgetGlobalVar('moveButton', $moveButton, SQ_POST) &&
- sqgetGlobalVar('msg', $msg, SQ_POST) &&
- sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST) &&
- is_array($msg) && !empty($msg) ) {
-
- $move_id = $msg[0];
-
- // Move message
- sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
- sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted', true);
-
- sqimap_mailbox_expunge_dmn($move_id);
-
- if ($targetMailbox != $lastTargetMailbox) {
- $lastTargetMailbox = $targetMailbox;
- sqsession_register('lastTargetMailbox' , $lastTargetMailbox);
- }
-}
-
-
/**
* $message contains all information about the message
* including header and body
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;
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;
$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;
}
projects / squirrelmail.git / blobdiff