From 197601ef5fa2e6aaabfb6e0baaf56179f7cc1ee3 Mon Sep 17 00:00:00 2001 From: thomascube Date: Wed, 30 Apr 2008 08:21:42 +0000 Subject: Next step: introduce the application class 'rcmail' and get rid of some global vars --- program/steps/mail/folders.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/steps/mail/folders.inc') 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']) -- cgit v1.2.3