diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/move_del.inc | 102 |
1 files changed, 47 insertions, 55 deletions
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index dad3ce7ef..9a02d938d 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -24,58 +24,53 @@ $old_count = $IMAP->messagecount(); $old_pages = ceil($old_count / $IMAP->page_size); // move messages -if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) -{ - $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); - $target = get_input_value('_target_mbox', RCUBE_INPUT_POST); - $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST)); +if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) { + $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); + $target = get_input_value('_target_mbox', RCUBE_INPUT_POST); + $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST)); - if (!$moved) - { - // send error message - $OUTPUT->command('list_mailbox'); - $OUTPUT->show_message('errormoving', 'error'); - $OUTPUT->send(); - exit; - } + if (!$moved) { + // send error message + $OUTPUT->command('list_mailbox'); + $OUTPUT->show_message('errormoving', 'error'); + $OUTPUT->send(); + exit; + } } - // delete messages -else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) -{ - $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); - $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST)); +else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { + trigger_error("DELETE", E_USER_WARNING); + + $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); + $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST)); - if (!$del) - { - // send error message - $OUTPUT->command('list_mailbox'); - $OUTPUT->show_message('errordeleting', 'error'); - $OUTPUT->send(); - exit; - } + if (!$del) { + // send error message + $OUTPUT->command('list_mailbox'); + $OUTPUT->show_message('errordeleting', 'error'); + $OUTPUT->send(); + exit; + } } - // unknown action or missing query param -else - exit; - +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(); - +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); +$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); +$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; +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 @@ -89,26 +84,23 @@ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); $mbox = $IMAP->get_mailbox_name(); $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); -if ($RCMAIL->action=='moveto' && $target) - $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN')); +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())); // add new rows from next page (if any) -if ($_POST['_from']!='show' && ($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']; +if ($_POST['_from']!='show' && ($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']; - $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order); - if (!$jump_back) - $a_headers = array_slice($a_headers, -$count, $count); - - rcmail_js_message_list($a_headers); + $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order); + if (!$jump_back) { + $a_headers = array_slice($a_headers, -$count, $count); + } + rcmail_js_message_list($a_headers); } - // send response $OUTPUT->send(); - -?> |