diff options
| author | thomascube <thomas@roundcube.net> | 2008-04-30 08:21:42 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-04-30 08:21:42 +0000 |
| commit | 197601ef5fa2e6aaabfb6e0baaf56179f7cc1ee3 (patch) | |
| tree | 464b77acd299fa37a753e384b5bc14bda0cd16fa /program/steps/mail/folders.inc | |
| parent | 0dfae004d84f428f1af1884282d24c32d6fc3173 (diff) | |
Next step: introduce the application class 'rcmail' and get rid of some global vars
Diffstat (limited to 'program/steps/mail/folders.inc')
| -rw-r--r-- | program/steps/mail/folders.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc index b84398f26..69f3c0e4c 100644 --- a/program/steps/mail/folders.inc +++ b/program/steps/mail/folders.inc @@ -21,7 +21,7 @@ $mbox_name = $IMAP->get_mailbox_name(); // send EXPUNGE command -if ($_action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) +if ($RCMAIL->action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) { $success = $IMAP->expunge($mbox); @@ -29,7 +29,7 @@ if ($_action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) if ($success && !empty($_REQUEST['_reload'])) { $OUTPUT->command('message_list.clear'); - $_action = 'list'; + $RCMAIL->action = 'list'; return; } else @@ -37,7 +37,7 @@ if ($_action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) } // clear mailbox -else if ($_action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) +else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) { // we should only be purging trash and junk if($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']) |