diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-07 10:41:15 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-07 10:41:15 +0000 |
| commit | ea3d91249609d60de8ea570b2f7694fc283a175c (patch) | |
| tree | bec327a12af45080ff03ed46cc7d665563af1aec /roundcubemail/program/steps/mail/folders.inc | |
| parent | 34e371d586aa6fb180cb799a541d4fdf57925df4 (diff) | |
- Remove deprecated global $IMAP variable usage (#1488148)
git-svn-id: https://svn.roundcube.net/trunk@5563 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/folders.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/folders.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/folders.inc b/roundcubemail/program/steps/mail/folders.inc index fad2bf3e3..6e687b06a 100644 --- a/roundcubemail/program/steps/mail/folders.inc +++ b/roundcubemail/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'); |
