X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fmove_del.inc;h=30928d499aa0d0f3e8ebd09b7ec1852a5af6d920;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=1d20e15775b2ab0dec318c240fcf0683c6a15449;hpb=0af63e79917234f76cfa7ec74e9d97b24fbf9b55;p=roundcube.git diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 1d20e15..30928d4 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/mail/move_del.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,77 +15,130 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: move_del.inc 269 2006-06-29 23:41:40Z richs $ + $Id: move_del.inc 5266 2011-09-22 07:49:33Z alec $ */ -$REMOTE_REQUEST = TRUE; +// only process ajax requests +if (!$OUTPUT->ajax_call) + return; + +// count messages before changing anything +$old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); +$old_pages = ceil($old_count / $IMAP->page_size); // move messages -if ($_action=='moveto' && $_GET['_uid'] && $_GET['_target_mbox']) - { - $count = sizeof(explode(',', $_GET['_uid'])); - $moved = $IMAP->move_message($_GET['_uid'], $_GET['_target_mbox'], $_GET['_mbox']); - - if (!$moved) - { - // send error message - $commands = "this.list_mailbox();\n"; - $commands .= show_message('errormoving', 'error'); - rcube_remote_response($commands); - exit; +if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) { + $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); + $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true); + $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); + + $moved = $IMAP->move_message($uids, $target, $mbox); + + if (!$moved) { + // send error message + if ($_POST['_from'] != 'show') + $OUTPUT->command('list_mailbox'); + rcmail_display_server_error('errormoving'); + $OUTPUT->send(); + exit; + } + else { + $OUTPUT->show_message('messagemoved', 'confirmation'); } - } + $addrows = true; +} // delete messages -else if ($_action=='delete' && $_GET['_uid']) - { - $count = sizeof(explode(',', $_GET['_uid'])); - $del = $IMAP->delete_message($_GET['_uid'], $_GET['_mbox']); - - if (!$del) - { - // send error message - $commands = "this.list_mailbox();\n"; - $commands .= show_message('errordeleting', 'error'); - rcube_remote_response($commands); - exit; +else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { + $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); + $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); + + $del = $IMAP->delete_message($uids, $mbox); + + if (!$del) { + // send error message + if ($_POST['_from'] != 'show') + $OUTPUT->command('list_mailbox'); + rcmail_display_server_error('errordeleting'); + $OUTPUT->send(); + exit; } - } - + else { + $OUTPUT->show_message('messagedeleted', 'confirmation'); + } + + $addrows = true; +} // unknown action or missing query param +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'] = $IMAP->refresh_search(); +} + +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 - { - exit; +{ + $msg_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); + $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 && $remaining == 0) { + $IMAP->set_page($IMAP->list_page-1); + $_SESSION['page'] = $IMAP->list_page; + $jump_back = true; } + // update message count display + $OUTPUT->set_env('messagecount', $msg_count); + $OUTPUT->set_env('current_page', $IMAP->list_page); + $OUTPUT->set_env('pagecount', $pages); -// update message count display -$pages = ceil($IMAP->messagecount()/$IMAP->page_size); -$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text()); -$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages); + // update mailboxlist + $mbox = $IMAP->get_mailbox_name(); + $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0; + $old_unseen = rcmail_get_unseen_count($mbox); + if ($old_unseen != $unseen_count) { + $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX')); + rcmail_set_unseen_count($mbox, $unseen_count); + } + + if ($RCMAIL->action == 'moveto' && strlen($target)) { + rcmail_send_unread_count($target, true); + } -// update mailboxlist -$mbox = $IMAP->get_mailbox_name(); -$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN')); + $OUTPUT->command('set_quota', rcmail_quota_content()); + $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox); -if ($_action=='moveto') - $commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN')); + if ($IMAP->threading) + $count = get_input_value('_count', RCUBE_INPUT_POST); -$commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota()); + // add new rows from next page (if any) + if ($addrows && $count && $uids != '*' && ($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']; -// add new rows from next page (if any) -if ($_GET['_from']!='show' && $pages>1 && $IMAP->list_page < $pages) - { - $a_headers = $IMAP->list_headers($mbox, null, $_SESSION['sort_col'], $_SESSION['sort_order']); - $a_headers = array_slice($a_headers, -$count, $count); - $commands .= rcmail_js_message_list($a_headers); + $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, + $jump_back ? NULL : $count); + + rcmail_js_message_list($a_headers, false); } +} - // send response -rcube_remote_response($commands); +$OUTPUT->send(); + -exit; -?>