diff options
Diffstat (limited to 'program/steps/mail/folders.inc')
| -rw-r--r-- | program/steps/mail/folders.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc index 95d138c97..26f464b0c 100644 --- a/program/steps/mail/folders.inc +++ b/program/steps/mail/folders.inc @@ -22,14 +22,14 @@ if (!$OUTPUT->ajax_call) return; -$mbox_name = $IMAP->get_mailbox_name(); +$mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); // send EXPUNGE command -if ($RCMAIL->action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) +if ($RCMAIL->action=='expunge') { $success = $IMAP->expunge($mbox); - // reload message list if current mailbox + // reload message list if current mailbox if ($success && !empty($_REQUEST['_reload'])) { $OUTPUT->command('set_quota', rcmail_quota_content()); @@ -42,11 +42,11 @@ if ($RCMAIL->action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_ } // clear mailbox -else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) +else if ($RCMAIL->action=='purge') { $delimiter = $IMAP->get_hierarchy_delimiter(); $trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/'; - $junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/'; + $junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/'; // we should only be purging trash and junk (or their subfolders) if ($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox'] @@ -60,9 +60,9 @@ else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INP $OUTPUT->set_env('pagecount', 0); $OUTPUT->command('message_list.clear'); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); - $OUTPUT->command('set_unread_count', $mbox_name, 0); + $OUTPUT->command('set_unread_count', $mbox, 0); $OUTPUT->command('set_quota', rcmail_quota_content()); - $_SESSION['unseen_count'][$mbox_name] = 0; + $_SESSION['unseen_count'][$mbox] = 0; } else $commands = "// purged: $success"; |