From b6da0b76afb5697685c35b8584631294cfc7b12f Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 7 Dec 2011 10:41:15 +0000 Subject: - Remove deprecated global $IMAP variable usage (#1488148) --- 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 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'); -- cgit v1.2.3