banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* cs fixes

Browse Source
release-0.6
till 17 years ago
parent 4c6b662feb
commit e090a1a58f
1 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File

40
program/steps/mail/move_del.inc
Unescape Escape View File

@ -24,14 +24,12 @@ $old_count = $IMAP->messagecount();
$old_pages = ceil($old_count / $IMAP->page_size); $old_pages = ceil($old_count / $IMAP->page_size);
// move messages // move messages
if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
{
$count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
$target = get_input_value('_target_mbox', 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)); $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST));
if (!$moved) if (!$moved) {
{
// send error message // send error message
$OUTPUT->command('list_mailbox'); $OUTPUT->command('list_mailbox');
$OUTPUT->show_message('errormoving', 'error'); $OUTPUT->show_message('errormoving', 'error');
@ -39,15 +37,14 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe
exit; exit;
} }
} }
// delete messages // delete messages
else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) 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)))); $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
$del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST)); $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST));
if (!$del) if (!$del) {
{
// send error message // send error message
$OUTPUT->command('list_mailbox'); $OUTPUT->command('list_mailbox');
$OUTPUT->show_message('errordeleting', 'error'); $OUTPUT->show_message('errordeleting', 'error');
@ -55,15 +52,14 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid']))
exit; exit;
} }
} }
// unknown action or missing query param // unknown action or missing query param
else else {
exit; exit;
}
// refresh saved search set after moving some messages // refresh saved search set after moving some messages
if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
$_SESSION['search'][$search_request] = $IMAP->refresh_search(); $_SESSION['search'][$search_request] = $IMAP->refresh_search();
}
$msg_count = $IMAP->messagecount(); $msg_count = $IMAP->messagecount();
$pages = ceil($msg_count / $IMAP->page_size); $pages = ceil($msg_count / $IMAP->page_size);
@ -71,8 +67,7 @@ $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) // jump back one page (user removed the whole last page)
if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) {
{
$IMAP->set_page($IMAP->list_page-1); $IMAP->set_page($IMAP->list_page-1);
$_SESSION['page'] = $IMAP->list_page; $_SESSION['page'] = $IMAP->list_page;
$jump_back = true; $jump_back = true;
@ -89,26 +84,23 @@ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
$mbox = $IMAP->get_mailbox_name(); $mbox = $IMAP->get_mailbox_name();
$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); $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_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()));
// add new rows from next page (if any) // add new rows from next page (if any)
if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) {
{
$sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col']; $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']; $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
$a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order); $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
if (!$jump_back) if (!$jump_back) {
$a_headers = array_slice($a_headers, -$count, $count); $a_headers = array_slice($a_headers, -$count, $count);
}
rcmail_js_message_list($a_headers); rcmail_js_message_list($a_headers);
} }
// send response // send response
$OUTPUT->send(); $OUTPUT->send();
?>

Write Preview
Loading…
Cancel
Save