From dc2fc082d372cc58f6d660d89fa19788be0d4c34 Mon Sep 17 00:00:00 2001 From: alecpl Date: Sat, 30 May 2009 15:10:35 +0000 Subject: - After move/delete from 'show' action display next message instead of messages list (#1485887) --- program/js/app.js | 23 ++++++++++------ program/steps/mail/move_del.inc | 61 +++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 32 deletions(-) (limited to 'program') diff --git a/program/js/app.js b/program/js/app.js index 4a90bf200..18a4f1ae3 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1797,7 +1797,7 @@ function rcube_webmail() this.show_contentframe(false); // Hide message command buttons until a message is selected - this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false); + this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'viewsource', 'download', false); this._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true)); }; @@ -1809,7 +1809,7 @@ function rcube_webmail() // exit if no mailbox specified or if selection is empty if (!this.env.uid && !selection.length) - return; + return; // if there is a trash mailbox defined and we're not currently in it: if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() != String(this.env.trash_mailbox).toLowerCase()) @@ -1830,8 +1830,8 @@ function rcube_webmail() else if (!this.env.trash_mailbox && this.env.flag_for_deletion) { this.mark_message('delete'); - if(this.env.action=="show") - this.command('nextmessage','',this); + if (this.env.action == 'show') + this.command('nextmessage', '', this); else if (selection.length == 1) this.message_list.select_next(); } @@ -1885,6 +1885,9 @@ function rcube_webmail() if (this.env.search_request) add_url += '&_search='+this.env.search_request; + if (this.env.next_uid) + add_url += '&_next_uid='+this.env.next_uid; + // send request to server this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock); }; @@ -3929,9 +3932,10 @@ function rcube_webmail() } case 'moveto': - if (this.env.action == 'show') - this.command('list'); - else if (this.message_list) + if (this.env.action == 'show') { + // re-enable commands on move/delete error + this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'viewsource', 'download', true); + } else if (this.message_list) this.message_list.init(); break; @@ -3942,8 +3946,9 @@ function rcube_webmail() if (this.env.contentframe) this.show_contentframe(false); // disable commands useless when mailbox is empty - this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource', - 'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false); + this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', + 'mark', 'viewsource', 'open', 'download', 'print', 'load-attachment', + 'purge', 'expunge', 'select-all', 'select-none', 'sort', false); } break; diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 399d41f65..c4294b01f 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -37,7 +37,8 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe if (!$moved) { // send error message - $OUTPUT->command('list_mailbox'); + if ($_POST['_from'] != 'show') + $OUTPUT->command('list_mailbox'); $OUTPUT->show_message('errormoving', 'error'); $OUTPUT->send(); exit; @@ -54,7 +55,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { if (!$del) { // send error message - $OUTPUT->command('list_mailbox'); + if ($_POST['_from'] != 'show') + $OUTPUT->command('list_mailbox'); $OUTPUT->show_message('errordeleting', 'error'); $OUTPUT->send(); exit; @@ -66,41 +68,51 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { else { exit; } + // refresh saved search set after moving some messages if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) { $_SESSION['search'][$search_request] = $IMAP->refresh_search(); } -$msg_count = $IMAP->messagecount(); -$pages = ceil($msg_count / $IMAP->page_size); -$nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page; -$remaining = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1); - -// jump back one page (user removed the whole last page) -if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) { +if ($_POST['_from'] == 'show') +{ + if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) + $OUTPUT->command('show_message', $next); + else + $OUTPUT->command('command', 'list'); +} +else +{ + $msg_count = $IMAP->messagecount(); + $pages = ceil($msg_count / $IMAP->page_size); + $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page; + $remaining = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1); + + // jump back one page (user removed the whole last page) + if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) { $IMAP->set_page($IMAP->list_page-1); $_SESSION['page'] = $IMAP->list_page; $jump_back = true; -} + } -// update message count display -$OUTPUT->set_env('pagecount', $pages); -$OUTPUT->set_env('messagecount', $msg_count); -$OUTPUT->set_env('current_page', $IMAP->list_page); -$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); + // update message count display + $OUTPUT->set_env('messagecount', $msg_count); + $OUTPUT->set_env('current_page', $IMAP->list_page); + $OUTPUT->set_env('pagecount', $pages); -// update mailboxlist -$mbox = $IMAP->get_mailbox_name(); -$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); + // update mailboxlist + $mbox = $IMAP->get_mailbox_name(); + $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); -if ($RCMAIL->action=='moveto' && $target) { + if ($RCMAIL->action=='moveto' && $target) { $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN')); -} + } -$OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota())); + $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota())); + $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); -// add new rows from next page (if any) -if ($addrows && $_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) { + // add new rows from next page (if any) + if ($addrows && ($jump_back || $nextpage_count > 0)) { $sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col']; $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order']; @@ -109,7 +121,10 @@ if ($addrows && $_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) $a_headers = array_slice($a_headers, -$count, $count); } rcmail_js_message_list($a_headers, false, false); + } } // send response $OUTPUT->send(); + +?> -- cgit v1.2.3