summaryrefslogtreecommitdiff
path: root/program/steps/mail/folders.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-12-07 10:41:15 +0000
committeralecpl <alec@alec.pl>2011-12-07 10:41:15 +0000
commitb6da0b76afb5697685c35b8584631294cfc7b12f (patch)
treeda81d13466eccdfe287075e5a77ee37ab485a1bc /program/steps/mail/folders.inc
parent7e263ea2048721482c00db65d4511f00c4c7b1d4 (diff)
- Remove deprecated global $IMAP variable usage (#1488148)
Diffstat (limited to 'program/steps/mail/folders.inc')
-rw-r--r--program/steps/mail/folders.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index fad2bf3e3..6e687b06a 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -27,7 +27,7 @@ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
// send EXPUNGE command
if ($RCMAIL->action == 'expunge') {
- $success = $IMAP->expunge($mbox);
+ $success = $RCMAIL->imap->expunge($mbox);
// reload message list if current mailbox
if ($success) {
@@ -48,7 +48,7 @@ if ($RCMAIL->action == 'expunge') {
// clear mailbox
else if ($RCMAIL->action == 'purge')
{
- $delimiter = $IMAP->get_hierarchy_delimiter();
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
$trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/';
$junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/';
@@ -56,7 +56,7 @@ else if ($RCMAIL->action == 'purge')
if ($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']
|| preg_match($trash_regexp, $mbox) || preg_match($junk_regexp, $mbox)
) {
- $success = $IMAP->clear_mailbox($mbox);
+ $success = $RCMAIL->imap->clear_mailbox($mbox);
if ($success) {
$OUTPUT->show_message('folderpurged', 'confirmation');